public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 0/4] Support C++ pointer-to-member types
@ 2023-12-01 15:51 Dodji Seketeli
  2023-12-01 15:54 ` [PATCH 1/4, applied] Improve type naming Dodji Seketeli
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Dodji Seketeli @ 2023-12-01 15:51 UTC (permalink / raw)
  To: libabigail

Hello,

This patch is in response to a feature enhancement request filed at
https://sourceware.org/bugzilla/show_bug.cgi?id=30260.

The first patch is a preparatory patch that improves how type names are
pretty-printed, especially derived types like pointers and arrays.

The second patch really is the patch that adds the support for C++
pointer-to-member types.

The last two patches bump the ABIXML format version and libabigail
SONAME due to the changes made to the ABIXML format and to the ABI of
libabigail itself.

Dodji Seketeli (4):
  Improve type naming
  Bug 30260 - Support pointer-to-member type
  Bump abixml version to 2.3
  Bump LIBABIGAIL_SO_CURRENT version to 4

 configure.ac                                  |     4 +-
 include/abg-comparison.h                      |    62 +
 include/abg-fwd.h                             |    55 +-
 include/abg-ir.h                              |    78 +-
 include/abg-reporter.h                        |    18 +
 src/abg-comparison-priv.h                     |    13 +
 src/abg-comparison.cc                         |   161 +
 src/abg-default-reporter.cc                   |    94 +
 src/abg-dwarf-reader.cc                       |    91 +-
 src/abg-ir.cc                                 |  1860 +-
 src/abg-leaf-reporter.cc                      |    15 +
 src/abg-reader.cc                             |    85 +
 src/abg-writer.cc                             |   106 +-
 tests/data/Makefile.am                        |    29 +
 .../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 +-
 .../test-ptr-to-mbr1-output-1.txt             |    18 +
 .../pointer-to-member/test-ptr-to-mbr1-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr1-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr1-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr1-v1.o   |   Bin 0 -> 2656 bytes
 .../test-ptr-to-mbr2-output-1.txt             |    13 +
 .../pointer-to-member/test-ptr-to-mbr2-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr2-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr2-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr2-v1.o   |   Bin 0 -> 2624 bytes
 .../test-ptr-to-mbr3-output-1.txt             |    20 +
 .../pointer-to-member/test-ptr-to-mbr3-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr3-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr3-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr3-v1.o   |   Bin 0 -> 2664 bytes
 .../test-ptr-to-mbr4-output-1.txt             |    12 +
 .../pointer-to-member/test-ptr-to-mbr4-v0.cc  |     8 +
 .../pointer-to-member/test-ptr-to-mbr4-v0.o   |   Bin 0 -> 2688 bytes
 .../pointer-to-member/test-ptr-to-mbr4-v1.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr4-v1.o   |   Bin 0 -> 2696 bytes
 .../test-ptr-to-mbr5-output-1.txt             |     0
 .../pointer-to-member/test-ptr-to-mbr5-v0.cc  |     8 +
 .../pointer-to-member/test-ptr-to-mbr5-v0.o   |   Bin 0 -> 2640 bytes
 .../pointer-to-member/test-ptr-to-mbr5-v1.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr5-v1.o   |   Bin 0 -> 2648 bytes
 .../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 +-
 .../PR29443-missing-xx.o.annotated.abi        |     2 +-
 tests/data/test-annotate/libtest23.so.abi     |     2 +-
 .../test-annotate/libtest24-drop-fns-2.so.abi |     2 +-
 .../test-annotate/libtest24-drop-fns.so.abi   |     2 +-
 .../test-anonymous-members-0.o.abi            |     2 +-
 .../test-pointer-to-member-1.o.annotated.abi  |    99 +
 tests/data/test-annotate/test0.abi            |     2 +-
 tests/data/test-annotate/test1.abi            |     2 +-
 .../data/test-annotate/test13-pr18894.so.abi  |   308 +-
 .../data/test-annotate/test14-pr18893.so.abi  |   322 +-
 .../data/test-annotate/test15-pr18892.so.abi  |  2870 +-
 .../data/test-annotate/test17-pr19027.so.abi  |  3102 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |    38 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |  1618 +-
 tests/data/test-annotate/test2.so.abi         |     2 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |    76 +-
 .../data/test-annotate/test21-pr19092.so.abi  |   276 +-
 tests/data/test-annotate/test3.so.abi         |     2 +-
 tests/data/test-annotate/test4.so.abi         |     2 +-
 tests/data/test-annotate/test5.o.abi          |     2 +-
 tests/data/test-annotate/test6.so.abi         |     2 +-
 tests/data/test-annotate/test7.so.abi         |    26 +-
 .../test8-qualified-this-pointer.so.abi       |     2 +-
 .../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-btf/test0.o.abi          |     2 +-
 tests/data/test-read-btf/test1.o.abi          |     2 +-
 .../test-read-ctf/PR27700/test-PR27700.abi    |     2 +-
 tests/data/test-read-ctf/test-PR26568-1.o.abi |     2 +-
 tests/data/test-read-ctf/test-PR26568-2.o.abi |     2 +-
 tests/data/test-read-ctf/test-alias.o.abi     |     2 +-
 .../test-ambiguous-struct-A.o.hash.abi        |     2 +-
 .../test-ambiguous-struct-B.o.hash.abi        |     2 +-
 .../test-read-ctf/test-anonymous-fields.o.abi |     2 +-
 .../test-read-ctf/test-array-mdimension.abi   |     2 +-
 .../test-read-ctf/test-array-of-pointers.abi  |     2 +-
 tests/data/test-read-ctf/test-array-size.abi  |     2 +-
 .../data/test-read-ctf/test-bitfield-enum.abi |     2 +-
 tests/data/test-read-ctf/test-bitfield.abi    |     2 +-
 tests/data/test-read-ctf/test-callback.abi    |     2 +-
 tests/data/test-read-ctf/test-callback2.abi   |     2 +-
 .../test-conflicting-type-syms-a.o.hash.abi   |     2 +-
 .../test-conflicting-type-syms-b.o.hash.abi   |     2 +-
 tests/data/test-read-ctf/test-const-array.abi |     2 +-
 .../test-read-ctf/test-dynamic-array.o.abi    |     2 +-
 .../test-read-ctf/test-enum-many.o.hash.abi   |     2 +-
 .../test-read-ctf/test-enum-symbol.o.hash.abi |     2 +-
 tests/data/test-read-ctf/test-enum.o.abi      |     2 +-
 tests/data/test-read-ctf/test-fallback.abi    |     2 +-
 .../test-read-ctf/test-forward-type-decl.abi  |     2 +-
 .../test-functions-declaration.abi            |     2 +-
 .../data/test-read-ctf/test-linux-module.abi  |     2 +-
 tests/data/test-read-ctf/test-list-struct.abi |     2 +-
 tests/data/test-read-ctf/test0.abi            |     2 +-
 tests/data/test-read-ctf/test0.hash.abi       |     2 +-
 tests/data/test-read-ctf/test1.so.abi         |     2 +-
 tests/data/test-read-ctf/test1.so.hash.abi    |     2 +-
 tests/data/test-read-ctf/test2.so.abi         |     2 +-
 tests/data/test-read-ctf/test2.so.hash.abi    |     2 +-
 tests/data/test-read-ctf/test3.so.abi         |     2 +-
 tests/data/test-read-ctf/test3.so.hash.abi    |     2 +-
 tests/data/test-read-ctf/test4.so.abi         |     2 +-
 tests/data/test-read-ctf/test4.so.hash.abi    |     2 +-
 tests/data/test-read-ctf/test5.o.abi          |     2 +-
 tests/data/test-read-ctf/test7.o.abi          |     2 +-
 tests/data/test-read-ctf/test8.o.abi          |     2 +-
 tests/data/test-read-ctf/test9.o.abi          |    16 +-
 .../PR22015-libboost_iostreams.so.abi         |  2731 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    |   332 +-
 .../PR24378-fn-is-not-scope.abi               |     2 +-
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi |  1368 +-
 .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi |     2 +-
 .../test-read-dwarf/PR26261/PR26261-exe.abi   |     2 +-
 .../test-read-dwarf/PR27700/test-PR27700.abi  |     2 +-
 .../PR28584/PR28584-smv.clang.o.abi           |     2 +-
 .../test-read-dwarf/PR29443-missing-xx.o.abi  |     2 +-
 .../PR29692-kdelibs3-libkjava.so.1.0.0.abi    |     2 +-
 tests/data/test-read-dwarf/libtest23.so.abi   |     2 +-
 .../libtest24-drop-fns-2.so.abi               |     2 +-
 .../test-read-dwarf/libtest24-drop-fns.so.abi |     2 +-
 .../data/test-read-dwarf/test-PR26568-1.o.abi |     2 +-
 .../data/test-read-dwarf/test-PR26568-2.o.abi |     2 +-
 tests/data/test-read-dwarf/test-fallback.abi  |     2 +-
 .../test-read-dwarf/test-libaaudio.so.abi     |    28 +-
 .../test-read-dwarf/test-libandroid.so.abi    |  1222 +-
 .../test-pointer-to-member-1.cc               |    30 +
 .../test-pointer-to-member-1.o                |   Bin 0 -> 4360 bytes
 .../test-pointer-to-member-1.o.abi            |    59 +
 .../test-suppressed-alias.o.abi               |     2 +-
 tests/data/test-read-dwarf/test0.abi          |     2 +-
 tests/data/test-read-dwarf/test0.hash.abi     |     2 +-
 tests/data/test-read-dwarf/test1.abi          |     2 +-
 tests/data/test-read-dwarf/test1.hash.abi     |     2 +-
 .../test-read-dwarf/test10-pr18818-gcc.so.abi |     2 +-
 .../test-read-dwarf/test11-pr18828.so.abi     |  5562 ++--
 .../test-read-dwarf/test12-pr18844.so.abi     | 24157 ++++++++--------
 .../test-read-dwarf/test13-pr18894.so.abi     |   166 +-
 .../test-read-dwarf/test14-pr18893.so.abi     |    22 +-
 .../test-read-dwarf/test15-pr18892.so.abi     |  1608 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |   646 +-
 .../test-read-dwarf/test17-pr19027.so.abi     |  2792 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |     2 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |   952 +-
 tests/data/test-read-dwarf/test2.so.abi       |     2 +-
 tests/data/test-read-dwarf/test2.so.hash.abi  |     2 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |     2 +-
 .../test-read-dwarf/test21-pr19092.so.abi     |    50 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |   564 +-
 .../test-read-dwarf/test3-alias-1.so.hash.abi |     2 +-
 .../test-read-dwarf/test3-alias-2.so.hash.abi |     2 +-
 .../test-read-dwarf/test3-alias-3.so.hash.abi |     2 +-
 .../test-read-dwarf/test3-alias-4.so.hash.abi |     2 +-
 tests/data/test-read-dwarf/test3.so.abi       |     2 +-
 tests/data/test-read-dwarf/test3.so.hash.abi  |     2 +-
 tests/data/test-read-dwarf/test4.so.abi       |     2 +-
 tests/data/test-read-dwarf/test4.so.hash.abi  |     2 +-
 tests/data/test-read-dwarf/test5.o.abi        |     2 +-
 tests/data/test-read-dwarf/test5.o.hash.abi   |     2 +-
 tests/data/test-read-dwarf/test6.so.abi       |     2 +-
 tests/data/test-read-dwarf/test6.so.hash.abi  |     2 +-
 tests/data/test-read-dwarf/test7.so.abi       |    16 +-
 tests/data/test-read-dwarf/test7.so.hash.abi  |    12 +-
 .../test8-qualified-this-pointer.so.abi       |     2 +-
 .../test8-qualified-this-pointer.so.hash.abi  |     2 +-
 .../test9-pr18818-clang.so.abi                |     2 +-
 tests/data/test-read-write/test-crc.xml       |     2 +-
 tests/data/test-read-write/test26.xml         |     2 +-
 tests/data/test-read-write/test27.xml         |     2 +-
 .../test28-without-std-fns-ref.xml            |     2 +-
 .../test28-without-std-vars-ref.xml           |     2 +-
 tests/test-abidiff-exit.cc                    |    75 +
 tests/test-annotate.cc                        |     5 +
 tests/test-read-dwarf.cc                      |     9 +
 249 files changed, 28856 insertions(+), 26184 deletions(-)
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o
 create mode 100644 tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.cc
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.o
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi

-- 
2.39.3


-- 
		Dodji


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/4, applied] Improve type naming
  2023-12-01 15:51 [PATCH 0/4] Support C++ pointer-to-member types Dodji Seketeli
@ 2023-12-01 15:54 ` Dodji Seketeli
  2023-12-01 15:54 ` [PATCH 2/4, applied] Bug 30260 - Support pointer-to-member type Dodji Seketeli
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Dodji Seketeli @ 2023-12-01 15:54 UTC (permalink / raw)
  To: libabigail

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(-)

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='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s'/>
       <!-- parameter of type 'int*' -->
@@ -26910,16 +26910,16 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, long int*) -->
-    <function-type size-in-bits='64' id='type-id-1149'>
+    <function-type size-in-bits='64' id='type-id-1173'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buffer'/>
       <!-- parameter of type 'long int*' -->
-      <parameter type-id='type-id-1168' name='result'/>
+      <parameter type-id='type-id-1190' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, int, int, __sanitizer::__sanitizer_hostent*, char*, SIZE_T, __sanitizer::__sanitizer_hostent**, int*) -->
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'int' -->
@@ -26927,20 +26927,20 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='type'/>
       <!-- 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 (void*, int, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1148'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s'/>
       <!-- parameter of type 'int' -->
@@ -26951,16 +26951,16 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::u32*) -->
-    <function-type size-in-bits='64' id='type-id-1141'>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='buf'/>
       <!-- parameter of type '__sanitizer::u32*' -->
-      <parameter type-id='type-id-1001' name='result'/>
+      <parameter type-id='type-id-1019' name='result'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='addr'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -26969,7 +26969,7 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1150'>
+    <function-type size-in-bits='64' id='type-id-1161'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -26979,17 +26979,17 @@
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, void ()*) -->
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <!-- int (void*, void (*)(void)) -->
+    <function-type size-in-bits='64' id='type-id-1175'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='o'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- 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**) -->
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th'/>
       <!-- parameter of type 'void**' -->
@@ -26998,18 +26998,18 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void**, SIZE_T*) -->
-    <function-type size-in-bits='64' id='type-id-1155'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-258' name='addr'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='size'/>
+      <parameter type-id='type-id-937' name='size'/>
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1156'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='s1'/>
       <!-- parameter of type 'void*' -->
@@ -27020,7 +27020,7 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1157'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='b'/>
       <!-- parameter of type 'void*' -->
@@ -27030,13 +27030,13 @@
       <!-- int -->
       <return type-id='type-id-6'/>
     </function-type>
-    <!-- int (void*, void*, void* (void*)*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1158'>
+    <!-- int (void*, void*, void* (*)(void*), void*) -->
+    <function-type size-in-bits='64' id='type-id-1180'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='th'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='attr'/>
-      <!-- parameter of type 'void* (void*)*' -->
+      <!-- parameter of type 'void* (*)(void*)' -->
       <parameter type-id='type-id-1218' name='callback'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='param'/>
@@ -27044,7 +27044,7 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1181'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='c'/>
       <!-- parameter of type 'void*' -->
@@ -27055,7 +27055,7 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- int (void*, void*, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1182'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -27068,11 +27068,11 @@
       <return type-id='type-id-6'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-929'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='nms'/>
       <!-- parameter of type 'typedef SIZE_T' -->
@@ -27083,11 +27083,11 @@
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1176'>
+    <function-type size-in-bits='64' id='type-id-930'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t**' -->
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len'/>
       <!-- parameter of type 'void*' -->
@@ -27096,18 +27096,18 @@
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (char*, const wchar_t*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1177'>
+    <function-type size-in-bits='64' id='type-id-931'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='dest'/>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-1055' name='src'/>
+      <parameter type-id='type-id-1077' name='src'/>
       <!-- parameter of type 'typedef SIZE_T' -->
       <parameter type-id='type-id-412' name='len'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (int, char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-932'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='name'/>
       <!-- parameter of type 'char*' -->
@@ -27118,7 +27118,7 @@
       <return type-id='type-id-412'/>
     </function-type>
     <!-- __sanitizer::uptr (int, int, void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1021'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6' name='request'/>
       <!-- parameter of type 'int' -->
@@ -27145,29 +27145,29 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- __sanitizer::uptr (void*) -->
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1022'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- typedef __sanitizer::uptr -->
       <return type-id='type-id-2'/>
     </function-type>
     <!-- SIZE_T (void*, char**, SIZE_T*, char**, SIZE_T*) -->
-    <function-type size-in-bits='64' id='type-id-1179'>
+    <function-type size-in-bits='64' id='type-id-933'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='cd'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='inbuf'/>
+      <parameter type-id='type-id-1043' name='inbuf'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='inbytesleft'/>
+      <parameter type-id='type-id-937' name='inbytesleft'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021' name='outbuf'/>
+      <parameter type-id='type-id-1043' name='outbuf'/>
       <!-- parameter of type 'SIZE_T*' -->
-      <parameter type-id='type-id-928' name='outbytesleft'/>
+      <parameter type-id='type-id-937' name='outbytesleft'/>
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
     <!-- __sanitizer::uptr (void*, __sanitizer::uptr, __sanitizer::uptr, void*) -->
-    <function-type size-in-bits='64' id='type-id-1195'>
+    <function-type size-in-bits='64' id='type-id-1023'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27180,7 +27180,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char**, SIZE_T, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1180'>
+    <function-type size-in-bits='64' id='type-id-934'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char**' -->
@@ -27195,7 +27195,7 @@
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char**, SIZE_T, void*) -->
-    <function-type size-in-bits='64' id='type-id-1181'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char**' -->
@@ -27208,7 +27208,7 @@
       <return type-id='type-id-412'/>
     </function-type>
     <!-- SIZE_T (wchar_t*, const char*, SIZE_T) -->
-    <function-type size-in-bits='64' id='type-id-1182'>
+    <function-type size-in-bits='64' id='type-id-936'>
       <!-- parameter of type 'wchar_t*' -->
       <parameter type-id='type-id-1225' name='dest'/>
       <!-- parameter of type 'const char*' -->
@@ -27218,14 +27218,23 @@
       <!-- typedef SIZE_T -->
       <return type-id='type-id-412'/>
     </function-type>
+    <!-- sighandler_t (int, sighandler_t) -->
+    <function-type size-in-bits='64' id='type-id-1198'>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-6' name='sig'/>
+      <!-- parameter of type 'typedef sighandler_t' -->
+      <parameter type-id='type-id-402' name='h'/>
+      <!-- typedef sighandler_t -->
+      <return type-id='type-id-402'/>
+    </function-type>
     <!-- void (double, double*, double*) -->
     <function-type size-in-bits='64' id='type-id-1203'>
       <!-- parameter of type 'double' -->
       <parameter type-id='type-id-378' name='x'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='sin'/>
+      <parameter type-id='type-id-1083' name='sin'/>
       <!-- parameter of type 'double*' -->
-      <parameter type-id='type-id-1061' name='cos'/>
+      <parameter type-id='type-id-1083' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
@@ -27234,9 +27243,9 @@
       <!-- 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='sin'/>
+      <parameter type-id='type-id-1189' name='sin'/>
       <!-- parameter of type 'long double*' -->
-      <parameter type-id='type-id-1167' name='cos'/>
+      <parameter type-id='type-id-1189' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
@@ -27245,27 +27254,18 @@
       <!-- parameter of type 'float' -->
       <parameter type-id='type-id-379' name='x'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='sin'/>
+      <parameter type-id='type-id-1088' name='sin'/>
       <!-- parameter of type 'float*' -->
-      <parameter type-id='type-id-1066' name='cos'/>
+      <parameter type-id='type-id-1088' name='cos'/>
       <!-- void -->
       <return type-id='type-id-27'/>
     </function-type>
-    <!-- sighandler_t (int, sighandler_t) -->
-    <function-type size-in-bits='64' id='type-id-1199'>
-      <!-- parameter of type 'int' -->
-      <parameter type-id='type-id-6' name='sig'/>
-      <!-- parameter of type 'typedef sighandler_t' -->
-      <parameter type-id='type-id-402' name='h'/>
-      <!-- typedef sighandler_t -->
-      <return type-id='type-id-402'/>
-    </function-type>
     <!-- void (int, my_siginfo_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-1205'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- parameter of type 'my_siginfo_t*' -->
-      <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1193'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3'/>
       <!-- void -->
@@ -27299,14 +27299,14 @@
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void* (char*) -->
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1212'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- void* -->
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, char*) -->
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1213'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -27315,7 +27315,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, char*, void*) -->
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='path'/>
       <!-- parameter of type 'char*' -->
@@ -27326,7 +27326,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (char*, int, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-28' name='s'/>
       <!-- parameter of type 'int' -->
@@ -27337,7 +27337,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='filename'/>
       <!-- parameter of type 'int' -->
@@ -27346,7 +27346,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (__sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='sz'/>
       <!-- void* -->
@@ -27394,7 +27394,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (void*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='p'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27403,14 +27403,14 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- char* (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1013'>
+    <function-type size-in-bits='64' id='type-id-1035'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='str'/>
       <!-- char* -->
       <return type-id='type-id-28'/>
     </function-type>
     <!-- __sanitizer::uptr (const char*) -->
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1020'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4' name='s'/>
       <!-- typedef __sanitizer::uptr -->
@@ -27424,7 +27424,7 @@
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void* (__sanitizer::uptr, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2' name='align'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -27433,7 +27433,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- void* (void*, int, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-3' name='dst'/>
       <!-- parameter of type 'int' -->
@@ -28537,10 +28537,10 @@
     <!-- __sanitizer::StaticSpinMutex* -->
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-1357'/>
     <!-- __sanitizer::Suppression* -->
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-952'/>
     <!-- __sanitizer::ThreadContextBase* -->
     <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1240'/>
-    <!-- __sanitizer::ThreadContextBase* (typedef __sanitizer::u32)* -->
+    <!-- __sanitizer::ThreadContextBase* (*)(__sanitizer::u32) -->
     <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-332'/>
     <!-- __sanitizer::ThreadContextBase** -->
     <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1359'/>
@@ -28612,7 +28612,7 @@
     <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-1406'/>
     <!-- a8* -->
     <pointer-type-def type-id='type-id-1312' size-in-bits='64' id='type-id-1407'/>
-    <!-- bool (__sanitizer::ThreadContextBase*, void*)* -->
+    <!-- bool (*)(__sanitizer::ThreadContextBase*, void*) -->
     <pointer-type-def type-id='type-id-1408' size-in-bits='64' id='type-id-1409'/>
     <!-- char* -->
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-28'/>
@@ -28754,9 +28754,9 @@
     <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
     <!-- const volatile void -->
     <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
-    <!-- void (__sanitizer::ThreadContextBase*, void*)* -->
+    <!-- void (*)(__sanitizer::ThreadContextBase*, void*) -->
     <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1482'/>
-    <!-- void (typedef __sanitizer::uptr, void*)* -->
+    <!-- void (*)(__sanitizer::uptr, void*) -->
     <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-96'/>
     <!-- volatile __sanitizer::atomic_uint64_t::Type -->
     <qualified-type-def type-id='type-id-104' volatile='yes' id='type-id-1484'/>
@@ -30011,11 +30011,11 @@
       <!-- class __sanitizer::ThreadRegistry -->
       <class-decl name='ThreadRegistry' size-in-bits='1600' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='73' column='1' id='type-id-1360'>
         <member-type access='public'>
-          <!-- typedef bool (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::FindThreadCallback -->
+          <!-- typedef bool (*)(__sanitizer::ThreadContextBase*, void*) __sanitizer::ThreadRegistry::FindThreadCallback -->
           <typedef-decl name='FindThreadCallback' type-id='type-id-1409' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='99' column='1' id='type-id-1496'/>
         </member-type>
         <member-type access='public'>
-          <!-- typedef void (__sanitizer::ThreadContextBase*, void*)* __sanitizer::ThreadRegistry::ThreadCallback -->
+          <!-- typedef void (*)(__sanitizer::ThreadContextBase*, void*) __sanitizer::ThreadRegistry::ThreadCallback -->
           <typedef-decl name='ThreadCallback' type-id='type-id-1482' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_thread_registry.h' line='94' column='1' id='type-id-1497'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -30997,7 +30997,7 @@
         </member-function>
       </class-decl>
       <!-- struct __sanitizer::Suppression -->
-      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-933'>
+      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-950'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- __sanitizer::SuppressionType __sanitizer::Suppression::type -->
           <var-decl name='type' type-id='type-id-195' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='31' column='1'/>
@@ -31048,11 +31048,11 @@
           <var-decl name='val_dont_use' type-id='type-id-1486' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='50' column='1'/>
         </data-member>
       </class-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'/>
-      <!-- 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'/>
       <!-- typedef unsigned int __sanitizer::u32 -->
       <typedef-decl name='u32' type-id='type-id-172' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='68' column='1' id='type-id-237'/>
@@ -33500,7 +33500,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- __sanitizer::Suppression* __tsan::FiredSuppression::supp -->
-          <var-decl name='supp' type-id='type-id-935' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
+          <var-decl name='supp' type-id='type-id-952' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
         </data-member>
       </class-decl>
       <!-- struct __tsan::Flags -->
@@ -36919,10 +36919,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1571'/>
     <!-- rlimit* -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-267'/>
-    <!-- void (const __sanitizer::SuspendedThreadsList&, void*)* -->
-    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-312'/>
-    <!-- void (typedef __sanitizer::uptr, typedef __sanitizer::uptr, bool, __sanitizer::uptr*, typedef __sanitizer::uptr)* -->
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-239'/>
+    <!-- void (*)(__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) -->
+    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-239'/>
+    <!-- void (*)(const __sanitizer::SuspendedThreadsList&, void*) -->
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-312'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
       <!-- class __sanitizer::InternalMmapVector<int> -->
@@ -37221,11 +37221,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- 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'/>
       <!-- 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 (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'/>
       <!-- unsigned long int __sanitizer::Min<long unsigned int>(unsigned long int, unsigned long int) -->
       <function-decl name='Min&lt;long unsigned int&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -37315,7 +37315,7 @@
       </function-decl>
     </namespace-decl>
     <!-- void (const __sanitizer::SuspendedThreadsList&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1572'>
+    <function-type size-in-bits='64' id='type-id-1573'>
       <!-- parameter of type 'const __sanitizer::SuspendedThreadsList&' -->
       <parameter type-id='type-id-1568'/>
       <!-- parameter of type 'void*' -->
@@ -37324,7 +37324,7 @@
       <return type-id='type-id-27'/>
     </function-type>
     <!-- void (__sanitizer::uptr, __sanitizer::uptr, bool, __sanitizer::uptr*, __sanitizer::uptr) -->
-    <function-type size-in-bits='64' id='type-id-1573'>
+    <function-type size-in-bits='64' id='type-id-1572'>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef __sanitizer::uptr' -->
@@ -39014,9 +39014,9 @@
     <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1671'/>
     <!-- const volatile __sanitizer::atomic_uint8_t* -->
     <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-105'/>
-    <!-- void (const char*, int, const char*, typedef __sanitizer::u64, typedef __sanitizer::u64)* -->
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-157'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(const char*, int, const char*, __sanitizer::u64, __sanitizer::u64) -->
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-157'/>
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-469'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-258'/>
@@ -39942,7 +39942,7 @@
           </function-decl>
         </member-function>
       </class-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'/>
       <!-- typedef int __sanitizer::fd_t -->
       <typedef-decl name='fd_t' type-id='type-id-6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='74' column='1' id='type-id-156'/>
@@ -42720,13 +42720,13 @@
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
     <!-- __sanitizer::Suppression* const -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1722'/>
     <!-- __sanitizer::Suppression* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-194'/>
     <!-- __sanitizer::Suppression* const* -->
     <pointer-type-def type-id='type-id-1722' size-in-bits='64' id='type-id-1723'/>
     <!-- __sanitizer::Suppression*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-193'/>
+    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-193'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*> -->
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-1724'/>
     <!-- const __sanitizer::InternalMmapVector<__sanitizer::Suppression*>& -->
@@ -43277,7 +43277,7 @@
     <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1738'/>
     <!-- dl_phdr_info* -->
     <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-38'/>
-    <!-- int (dl_phdr_info*, typedef size_t, void*)* -->
+    <!-- int (*)(dl_phdr_info*, size_t, void*) -->
     <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-36'/>
     <!-- namespace __sanitizer -->
     <namespace-decl name='__sanitizer'>
@@ -43290,7 +43290,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'char**' -->
-      <parameter type-id='type-id-1021'/>
+      <parameter type-id='type-id-1043'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-6'/>
       <!-- long int -->
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index d27999c0..98d5282e 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -973,7 +973,7 @@
     <typedef-decl name='hb_blob_t' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.h' line='65' column='1' id='type-id-43'/>
     <!-- typedef int hb_bool_t -->
     <typedef-decl name='hb_bool_t' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='73' column='1' id='type-id-40'/>
-    <!-- typedef void (void*)* hb_destroy_func_t -->
+    <!-- typedef void(*)(void*) hb_destroy_func_t -->
     <typedef-decl name='hb_destroy_func_t' type-id='type-id-44' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='339' column='1' id='type-id-20'/>
     <!-- typedef pthread_mutex_t hb_mutex_impl_t -->
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-45' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-29'/>
@@ -1085,7 +1085,7 @@
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-26'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-60'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-44'/>
     <!-- hb_blob_t* hb_blob_create(const char*, unsigned int, hb_memory_mode_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_blob_create' mangled-name='hb_blob_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_blob_create'>
@@ -2395,23 +2395,23 @@
     <typedef-decl name='hb_position_t' type-id='type-id-126' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-103'/>
     <!-- typedef hb_segment_properties_t hb_segment_properties_t -->
     <typedef-decl name='hb_segment_properties_t' type-id='type-id-104' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-85'/>
-    <!-- typedef enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_combining_class_func_t -->
+    <!-- typedef hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-127' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-109'/>
-    <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_compose_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
     <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-128' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-114'/>
-    <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_decompose_compatibility_func_t -->
+    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
     <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-129' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-116'/>
-    <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* hb_unicode_decompose_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-115'/>
-    <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_eastasian_width_func_t -->
+    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
     <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-110'/>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-132'/>
-    <!-- typedef enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_general_category_func_t -->
+    <!-- typedef hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-111'/>
-    <!-- typedef typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_mirroring_func_t -->
+    <!-- typedef hb_codepoint_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
     <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-112'/>
-    <!-- typedef enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_script_func_t -->
+    <!-- typedef hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-113'/>
     <!-- typedef _hb_var_int_t hb_var_int_t -->
     <typedef-decl name='hb_var_int_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-101'/>
@@ -2502,22 +2502,20 @@
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
     <!-- const unsigned int -->
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-89'/>
-    <!-- enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-134'/>
-    <!-- enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-127'/>
-    <!-- enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-133'/>
+    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-130'/>
+    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-128'/>
     <!-- hb_buffer_t* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-91'/>
     <!-- hb_buffer_t* -->
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-152'/>
     <!-- hb_buffer_t::scratch_buffer_t* -->
     <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-93'/>
     <!-- hb_codepoint_t* -->
     <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-119'/>
     <!-- hb_font_t* -->
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-153'/>
     <!-- hb_glyph_info_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-96'/>
     <!-- hb_glyph_info_t* -->
@@ -2526,17 +2524,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-124' size-in-bits='64' id='type-id-98'/>
     <!-- hb_glyph_position_t* -->
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-87'/>
+    <!-- hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-134'/>
+    <!-- hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-127'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-118'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-84'/>
-    <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-130'/>
-    <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-128'/>
-    <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
+    <!-- hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-133'/>
+    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-129'/>
-    <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
+    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-131'/>
     <!-- struct hb_font_t -->
     <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-121'>
@@ -3055,7 +3055,7 @@
     <!-- unsigned int hb_buffer_serialize_glyphs(hb_buffer_t*, unsigned int, unsigned int, char*, unsigned int, unsigned int*, hb_font_t*, hb_buffer_serialize_format_t, hb_buffer_serialize_flags_t) -->
     <function-decl name='hb_buffer_serialize_glyphs' mangled-name='hb_buffer_serialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='start' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='247' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3067,7 +3067,7 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='buf_consumed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='251' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_flags_t' -->
@@ -3078,7 +3078,7 @@
     <!-- hb_bool_t hb_buffer_deserialize_glyphs(hb_buffer_t*, const char*, int, const char**, hb_font_t*, hb_buffer_serialize_format_t) -->
     <function-decl name='hb_buffer_deserialize_glyphs' mangled-name='hb_buffer_deserialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_deserialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='354' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3086,14 +3086,14 @@
       <!-- parameter of type 'const char**' -->
       <parameter type-id='type-id-142' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- hb_script_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-150'>
+    <function-type size-in-bits='64' id='type-id-154'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3104,7 +3104,7 @@
       <return type-id='type-id-69'/>
     </function-type>
     <!-- hb_unicode_combining_class_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-151'>
+    <function-type size-in-bits='64' id='type-id-155'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3115,7 +3115,7 @@
       <return type-id='type-id-70'/>
     </function-type>
     <!-- hb_unicode_general_category_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-152'>
+    <function-type size-in-bits='64' id='type-id-156'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3126,7 +3126,7 @@
       <return type-id='type-id-71'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-155'>
+    <function-type size-in-bits='64' id='type-id-150'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3141,7 +3141,7 @@
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-156'>
+    <function-type size-in-bits='64' id='type-id-151'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -3344,31 +3344,31 @@
     <!-- hb_buffer_t* hb_buffer_create() -->
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- hb_buffer_t* hb_buffer_get_empty() -->
     <function-decl name='hb_buffer_get_empty' mangled-name='hb_buffer_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_empty'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- hb_buffer_t* hb_buffer_reference(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reference' mangled-name='hb_buffer_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reference'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <!-- void hb_buffer_destroy(hb_buffer_t*) -->
     <function-decl name='hb_buffer_destroy' mangled-name='hb_buffer_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_destroy'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_set_user_data(hb_buffer_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_buffer_set_user_data' mangled-name='hb_buffer_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='773' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -3383,7 +3383,7 @@
     <!-- void* hb_buffer_get_user_data(hb_buffer_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_buffer_get_user_data' mangled-name='hb_buffer_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='794' column='1'/>
       <!-- void* -->
@@ -3392,7 +3392,7 @@
     <!-- void hb_buffer_set_content_type(hb_buffer_t*, hb_buffer_content_type_t) -->
     <function-decl name='hb_buffer_set_content_type' mangled-name='hb_buffer_set_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
       <!-- parameter of type 'enum hb_buffer_content_type_t' -->
       <parameter type-id='type-id-64' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
       <!-- void -->
@@ -3401,14 +3401,14 @@
     <!-- hb_buffer_content_type_t hb_buffer_get_content_type(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_content_type' mangled-name='hb_buffer_get_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
       <!-- enum hb_buffer_content_type_t -->
       <return type-id='type-id-64'/>
     </function-decl>
     <!-- void hb_buffer_set_unicode_funcs(hb_buffer_t*, hb_unicode_funcs_t*) -->
     <function-decl name='hb_buffer_set_unicode_funcs' mangled-name='hb_buffer_set_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
       <parameter type-id='type-id-84' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
       <!-- void -->
@@ -3417,14 +3417,14 @@
     <!-- hb_unicode_funcs_t* hb_buffer_get_unicode_funcs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_unicode_funcs' mangled-name='hb_buffer_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
       <!-- hb_unicode_funcs_t* -->
       <return type-id='type-id-84'/>
     </function-decl>
     <!-- void hb_buffer_set_direction(hb_buffer_t*, hb_direction_t) -->
     <function-decl name='hb_buffer_set_direction' mangled-name='hb_buffer_set_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
       <!-- void -->
@@ -3433,14 +3433,14 @@
     <!-- hb_direction_t hb_buffer_get_direction(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_direction' mangled-name='hb_buffer_get_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
       <!-- enum hb_direction_t -->
       <return type-id='type-id-68'/>
     </function-decl>
     <!-- void hb_buffer_set_script(hb_buffer_t*, hb_script_t) -->
     <function-decl name='hb_buffer_set_script' mangled-name='hb_buffer_set_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
       <!-- parameter of type 'enum hb_script_t' -->
       <parameter type-id='type-id-69' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
       <!-- void -->
@@ -3449,14 +3449,14 @@
     <!-- hb_script_t hb_buffer_get_script(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_script' mangled-name='hb_buffer_get_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
       <!-- enum hb_script_t -->
       <return type-id='type-id-69'/>
     </function-decl>
     <!-- void hb_buffer_set_language(hb_buffer_t*, hb_language_t) -->
     <function-decl name='hb_buffer_set_language' mangled-name='hb_buffer_set_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
       <!-- parameter of type 'typedef hb_language_t' -->
       <parameter type-id='type-id-105' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
       <!-- void -->
@@ -3465,14 +3465,14 @@
     <!-- hb_language_t hb_buffer_get_language(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_language' mangled-name='hb_buffer_get_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
       <!-- typedef hb_language_t -->
       <return type-id='type-id-105'/>
     </function-decl>
     <!-- void hb_buffer_set_segment_properties(hb_buffer_t*, const hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
       <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <!-- void -->
@@ -3481,7 +3481,7 @@
     <!-- void hb_buffer_get_segment_properties(hb_buffer_t*, hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <!-- parameter of type 'hb_segment_properties_t*' -->
       <parameter type-id='type-id-177' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <!-- void -->
@@ -3490,7 +3490,7 @@
     <!-- void hb_buffer_set_flags(hb_buffer_t*, hb_buffer_flags_t) -->
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
       <!-- parameter of type 'enum hb_buffer_flags_t' -->
       <parameter type-id='type-id-65' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
       <!-- void -->
@@ -3499,14 +3499,14 @@
     <!-- hb_buffer_flags_t hb_buffer_get_flags(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_flags' mangled-name='hb_buffer_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
       <!-- enum hb_buffer_flags_t -->
       <return type-id='type-id-65'/>
     </function-decl>
     <!-- void hb_buffer_set_replacement_codepoint(hb_buffer_t*, hb_codepoint_t) -->
     <function-decl name='hb_buffer_set_replacement_codepoint' mangled-name='hb_buffer_set_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
       <!-- void -->
@@ -3515,28 +3515,28 @@
     <!-- hb_codepoint_t hb_buffer_get_replacement_codepoint(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_replacement_codepoint' mangled-name='hb_buffer_get_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
       <!-- typedef hb_codepoint_t -->
       <return type-id='type-id-72'/>
     </function-decl>
     <!-- void hb_buffer_reset(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reset' mangled-name='hb_buffer_reset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reset'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_clear_contents(hb_buffer_t*) -->
     <function-decl name='hb_buffer_clear_contents' mangled-name='hb_buffer_clear_contents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_clear_contents'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_pre_allocate(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_pre_allocate' mangled-name='hb_buffer_pre_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_pre_allocate'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -3545,14 +3545,14 @@
     <!-- hb_bool_t hb_buffer_allocation_successful(hb_buffer_t*) -->
     <function-decl name='hb_buffer_allocation_successful' mangled-name='hb_buffer_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_allocation_successful'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- void hb_buffer_add(hb_buffer_t*, hb_codepoint_t, unsigned int) -->
     <function-decl name='hb_buffer_add' mangled-name='hb_buffer_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3563,7 +3563,7 @@
     <!-- hb_bool_t hb_buffer_set_length(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_set_length' mangled-name='hb_buffer_set_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1181' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -3572,14 +3572,14 @@
     <!-- unsigned int hb_buffer_get_length(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-18'/>
     </function-decl>
     <!-- hb_glyph_info_t* hb_buffer_get_glyph_infos(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_infos' mangled-name='hb_buffer_get_glyph_infos' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_infos'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1238' column='1'/>
       <!-- hb_glyph_info_t* -->
@@ -3588,7 +3588,7 @@
     <!-- hb_glyph_position_t* hb_buffer_get_glyph_positions(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_positions' mangled-name='hb_buffer_get_glyph_positions' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_positions'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1260' column='1'/>
       <!-- hb_glyph_position_t* -->
@@ -3597,28 +3597,28 @@
     <!-- void hb_buffer_reverse(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse' mangled-name='hb_buffer_reverse' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_reverse_clusters(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse_clusters' mangled-name='hb_buffer_reverse_clusters' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse_clusters'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_guess_segment_properties(hb_buffer_t*) -->
     <function-decl name='hb_buffer_guess_segment_properties' mangled-name='hb_buffer_guess_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_guess_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- void hb_buffer_add_utf8(hb_buffer_t*, const char*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf8' mangled-name='hb_buffer_add_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf8'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1414' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3633,7 +3633,7 @@
     <!-- void hb_buffer_add_utf16(hb_buffer_t*, const uint16_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <!-- parameter of type 'const uint16_t*' -->
       <parameter type-id='type-id-167' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3648,7 +3648,7 @@
     <!-- void hb_buffer_add_utf32(hb_buffer_t*, const uint32_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <!-- parameter of type 'const uint32_t*' -->
       <parameter type-id='type-id-171' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3663,7 +3663,7 @@
     <!-- void hb_buffer_add_codepoints(hb_buffer_t*, const hb_codepoint_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_codepoints' mangled-name='hb_buffer_add_codepoints' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_codepoints'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
       <!-- parameter of type 'const hb_codepoint_t*' -->
       <parameter type-id='type-id-95' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
       <!-- parameter of type 'int' -->
@@ -3678,7 +3678,7 @@
     <!-- void hb_buffer_normalize_glyphs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_normalize_glyphs' mangled-name='hb_buffer_normalize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_normalize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
@@ -4826,15 +4826,15 @@
     <typedef-decl name='hb_feature_t' type-id='type-id-198' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-219'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
     <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-220'/>
-    <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* hb_font_get_glyph_advance_func_t -->
+    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-221' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-222'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_contour_point_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
     <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-223' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-210'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* hb_font_get_glyph_extents_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
     <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-224' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-209'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* hb_font_get_glyph_from_name_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-225' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-212'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_font_get_glyph_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
     <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-226' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-202'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-203'/>
@@ -4842,11 +4842,11 @@
     <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-227' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-207'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-205'/>
-    <!-- typedef typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* hb_font_get_glyph_kerning_func_t -->
+    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
     <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-229' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-227'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* hb_font_get_glyph_name_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-211'/>
-    <!-- typedef typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* hb_font_get_glyph_origin_func_t -->
+    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-231' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-228'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-204'/>
@@ -4856,7 +4856,7 @@
     <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-206'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
     <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-232'/>
-    <!-- typedef hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* hb_reference_table_func_t -->
+    <!-- typedef hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-196'/>
     <!-- typedef typedef hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) hb_shape_func_t -->
     <typedef-decl name='hb_shape_func_t' type-id='type-id-234' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-235'/>
@@ -5067,8 +5067,20 @@
     <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <!-- hb_auto_trace_t<0, bool>* -->
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <!-- hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* -->
+    <!-- hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) -->
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-233'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-226'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-224'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-231'/>
+    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
     <!-- hb_face_t* -->
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-160'/>
     <!-- hb_face_t::plan_node_t* -->
@@ -5081,28 +5093,16 @@
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-159'/>
     <!-- hb_glyph_extents_t* -->
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-164'/>
+    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
+    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <!-- hb_position_t* -->
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
     <!-- hb_shape_func_t* -->
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-216'/>
     <!-- hb_shape_plan_t* -->
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-194'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, char*, unsigned int, void*)* -->
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_glyph_extents_t*, void*)* -->
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-224'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, hb_position_t*, hb_position_t*, void*)* -->
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-231'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-226'/>
-    <!-- typedef hb_bool_t (hb_font_t*, void*, typedef hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*)* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
-    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
-    <!-- typedef hb_position_t (hb_font_t*, void*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-370'/>
     <!-- hb_face_t* hb_face_create_for_tables(hb_reference_table_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
@@ -8918,7 +8918,7 @@
     <!-- hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-361'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'const char*' -->
@@ -8935,7 +8935,7 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-362'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8950,9 +8950,9 @@
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-363'>
+    <function-type size-in-bits='64' id='type-id-364'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8965,9 +8965,9 @@
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-364'>
+    <function-type size-in-bits='64' id='type-id-365'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -8982,9 +8982,9 @@
       <return type-id='type-id-40'/>
     </function-type>
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-365'>
+    <function-type size-in-bits='64' id='type-id-363'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9001,7 +9001,7 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-366'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9020,7 +9020,7 @@
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-367'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9035,7 +9035,7 @@
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-368'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9050,9 +9050,9 @@
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-194'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
-      <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-153'/>
+      <!-- parameter of type 'hb_buffer_t*' -->
+      <parameter type-id='type-id-152'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9274,7 +9274,7 @@
     <!-- hb_bool_t hb_font_get_glyph(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph' mangled-name='hb_font_get_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9287,7 +9287,7 @@
     <!-- hb_position_t hb_font_get_glyph_h_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_advance' mangled-name='hb_font_get_glyph_h_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
       <!-- typedef hb_position_t -->
@@ -9296,7 +9296,7 @@
     <!-- hb_position_t hb_font_get_glyph_v_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_advance' mangled-name='hb_font_get_glyph_v_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='469' column='1'/>
       <!-- typedef hb_position_t -->
@@ -9305,7 +9305,7 @@
     <!-- hb_bool_t hb_font_get_glyph_h_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
@@ -9318,7 +9318,7 @@
     <!-- hb_bool_t hb_font_get_glyph_v_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='510' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
@@ -9331,7 +9331,7 @@
     <!-- hb_position_t hb_font_get_glyph_h_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9342,7 +9342,7 @@
     <!-- hb_position_t hb_font_get_glyph_v_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_kerning' mangled-name='hb_font_get_glyph_v_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='top_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='549' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9353,7 +9353,7 @@
     <!-- hb_bool_t hb_font_get_glyph_extents(hb_font_t*, hb_codepoint_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
@@ -9364,7 +9364,7 @@
     <!-- hb_bool_t hb_font_get_glyph_contour_point(hb_font_t*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9379,7 +9379,7 @@
     <!-- hb_bool_t hb_font_get_glyph_name(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -9392,7 +9392,7 @@
     <!-- hb_bool_t hb_font_get_glyph_from_name(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph_from_name' mangled-name='hb_font_get_glyph_from_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_from_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9405,7 +9405,7 @@
     <!-- void hb_font_get_glyph_advance_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_advance_for_direction' mangled-name='hb_font_get_glyph_advance_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_advance_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9420,7 +9420,7 @@
     <!-- void hb_font_get_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='676' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9435,7 +9435,7 @@
     <!-- void hb_font_add_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='697' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9450,7 +9450,7 @@
     <!-- void hb_font_subtract_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='718' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9465,7 +9465,7 @@
     <!-- void hb_font_get_glyph_kerning_for_direction(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -9482,7 +9482,7 @@
     <!-- hb_bool_t hb_font_get_glyph_extents_for_origin(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
@@ -9495,7 +9495,7 @@
     <!-- hb_bool_t hb_font_get_glyph_contour_point_for_origin(hb_font_t*, hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9512,7 +9512,7 @@
     <!-- void hb_font_glyph_to_string(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
       <!-- parameter of type 'char*' -->
@@ -9525,7 +9525,7 @@
     <!-- hb_bool_t hb_font_glyph_from_string(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_glyph_from_string' mangled-name='hb_font_glyph_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_from_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-17' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='829' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9540,38 +9540,38 @@
       <!-- parameter of type 'hb_face_t*' -->
       <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_create_sub_font(hb_font_t*) -->
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
+      <parameter type-id='type-id-153' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_get_empty() -->
     <function-decl name='hb_font_get_empty' mangled-name='hb_font_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_empty'>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_font_t* hb_font_reference(hb_font_t*) -->
     <function-decl name='hb_font_reference' mangled-name='hb_font_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_reference'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- void hb_font_destroy(hb_font_t*) -->
     <function-decl name='hb_font_destroy' mangled-name='hb_font_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_destroy'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_font_set_user_data(hb_font_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_font_set_user_data' mangled-name='hb_font_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1000' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9586,7 +9586,7 @@
     <!-- void* hb_font_get_user_data(hb_font_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_font_get_user_data' mangled-name='hb_font_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1021' column='1'/>
       <!-- void* -->
@@ -9595,35 +9595,35 @@
     <!-- void hb_font_make_immutable(hb_font_t*) -->
     <function-decl name='hb_font_make_immutable' mangled-name='hb_font_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_make_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- hb_bool_t hb_font_is_immutable(hb_font_t*) -->
     <function-decl name='hb_font_is_immutable' mangled-name='hb_font_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_is_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- hb_font_t* hb_font_get_parent(hb_font_t*) -->
     <function-decl name='hb_font_get_parent' mangled-name='hb_font_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_parent'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- hb_face_t* hb_font_get_face(hb_font_t*) -->
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
       <!-- hb_face_t* -->
       <return type-id='type-id-160'/>
     </function-decl>
     <!-- void hb_font_set_funcs(hb_font_t*, hb_font_funcs_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
       <!-- parameter of type 'hb_font_funcs_t*' -->
       <parameter type-id='type-id-161' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9636,7 +9636,7 @@
     <!-- void hb_font_set_funcs_data(hb_font_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs_data' mangled-name='hb_font_set_funcs_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1140' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -9647,7 +9647,7 @@
     <!-- void hb_font_set_scale(hb_font_t*, int, int) -->
     <function-decl name='hb_font_set_scale' mangled-name='hb_font_set_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-11' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1170' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9658,7 +9658,7 @@
     <!-- void hb_font_get_scale(hb_font_t*, int*, int*) -->
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-575' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <!-- parameter of type 'int*' -->
@@ -9669,7 +9669,7 @@
     <!-- void hb_font_set_ppem(hb_font_t*, unsigned int, unsigned int) -->
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1211' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9680,7 +9680,7 @@
     <!-- void hb_font_get_ppem(hb_font_t*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_font_get_ppem' mangled-name='hb_font_get_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1233' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -10262,7 +10262,7 @@
         <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void* (typedef FT_Memory, long int)* FT_Alloc_Func -->
+    <!-- typedef void*(*)(FT_Memory, long int) FT_Alloc_Func -->
     <typedef-decl name='FT_Alloc_Func' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-622'/>
     <!-- typedef FT_BBox_ FT_BBox -->
     <typedef-decl name='FT_BBox' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-595'/>
@@ -10278,11 +10278,11 @@
     <typedef-decl name='FT_Face' type-id='type-id-640' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-585'/>
     <!-- typedef long int FT_Fixed -->
     <typedef-decl name='FT_Fixed' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-610'/>
-    <!-- typedef void (typedef FT_Memory, void*)* FT_Free_Func -->
+    <!-- typedef void(*)(FT_Memory, void*) FT_Free_Func -->
     <typedef-decl name='FT_Free_Func' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-623'/>
     <!-- typedef FT_Generic_ FT_Generic -->
     <typedef-decl name='FT_Generic' type-id='type-id-604' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-594'/>
-    <!-- typedef void (void*)* FT_Generic_Finalizer -->
+    <!-- typedef void(*)(void*) FT_Generic_Finalizer -->
     <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-44' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-605'/>
     <!-- typedef FT_GlyphSlotRec_* FT_GlyphSlot -->
     <typedef-decl name='FT_GlyphSlot' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-596'/>
@@ -10304,7 +10304,7 @@
     <typedef-decl name='FT_Outline' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-614'/>
     <!-- typedef long int FT_Pos -->
     <typedef-decl name='FT_Pos' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
-    <!-- typedef void* (typedef FT_Memory, long int, long int, void*)* FT_Realloc_Func -->
+    <!-- typedef void*(*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
     <typedef-decl name='FT_Realloc_Func' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-624'/>
     <!-- typedef short int FT_Short -->
     <typedef-decl name='FT_Short' type-id='type-id-80' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-583'/>
@@ -10316,9 +10316,9 @@
     <typedef-decl name='FT_Stream' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-601'/>
     <!-- typedef FT_StreamDesc_ FT_StreamDesc -->
     <typedef-decl name='FT_StreamDesc' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-633'/>
-    <!-- typedef void (typedef FT_Stream)* FT_Stream_CloseFunc -->
+    <!-- typedef void(*)(FT_Stream) FT_Stream_CloseFunc -->
     <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-635'/>
-    <!-- typedef unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* FT_Stream_IoFunc -->
+    <!-- typedef unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
     <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-634'/>
     <!-- typedef char FT_String -->
     <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-651'/>
@@ -10365,15 +10365,15 @@
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-627'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-581'/>
-    <!-- unsigned long int (typedef FT_Stream, unsigned long int, unsigned char*, unsigned long int)* -->
+    <!-- unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-650'/>
-    <!-- void (typedef FT_Memory, void*)* -->
+    <!-- void(*)(FT_Memory, void*) -->
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-641'/>
-    <!-- void (typedef FT_Stream)* -->
+    <!-- void(*)(FT_Stream) -->
     <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-649'/>
-    <!-- void* (typedef FT_Memory, long int)* -->
+    <!-- void*(*)(FT_Memory, long int) -->
     <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-637'/>
-    <!-- void* (typedef FT_Memory, long int, long int, void*)* -->
+    <!-- void*(*)(FT_Memory, long int, long int, void*) -->
     <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-645'/>
     <!-- FT_DriverRec_* -->
     <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
@@ -10434,19 +10434,19 @@
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <!-- void hb_ft_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ft_font_set_funcs' mangled-name='hb_ft_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
     <!-- FT_Face hb_ft_font_get_face(hb_font_t*) -->
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <!-- typedef FT_Face -->
       <return type-id='type-id-585'/>
     </function-decl>
@@ -12802,7 +12802,7 @@
     <!-- void hb_ot_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-decl>
@@ -13329,7 +13329,7 @@
         <!-- struct hb_ot_map_t::stage_map_t -->
         <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-921'>
           <member-type access='public'>
-            <!-- typedef void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* hb_ot_map_t::stage_map_t::pause_func_t -->
+            <!-- typedef void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) hb_ot_map_t::stage_map_t::pause_func_t -->
             <typedef-decl name='pause_func_t' type-id='type-id-957' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-956'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -13385,9 +13385,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13402,9 +13402,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13417,9 +13417,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -13432,9 +13432,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -14644,1032 +14644,1038 @@
     <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
-    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
+    <!-- OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
-    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
+    <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
-    <!-- OT::hb_closure_context_t* -->
+    <!-- OT::hb_apply_context_t::skipping_forward_iterator_t* -->
     <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
-    <!-- OT::hb_collect_glyphs_context_t* -->
+    <!-- OT::hb_closure_context_t* -->
     <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
-    <!-- OT::hb_get_coverage_context_t* -->
+    <!-- OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
-    <!-- OT::hb_would_apply_context_t* -->
+    <!-- OT::hb_collect_glyphs_context_t* -->
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
-    <!-- bool (hb_set_t*, const OT::USHORT&, void*)* -->
+    <!-- OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
-    <!-- bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* -->
+    <!-- OT::hb_get_coverage_context_t* -->
     <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
+    <!-- OT::hb_would_apply_context_t* -->
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
+    <!-- bool(*)(hb_codepoint_t, const OT::USHORT&, void*) -->
+    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
+    <!-- bool(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
     <!-- bool* -->
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1349'/>
     <!-- const GPOSProxy -->
-    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1344'/>
+    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1350'/>
     <!-- const GPOSProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-963'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1350' size-in-bits='64' id='type-id-963'/>
     <!-- const GSUBProxy -->
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1345'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1351'/>
     <!-- const GSUBProxy& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-961'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-961'/>
     <!-- const OT::AlternateSubst -->
-    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1346'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1352'/>
     <!-- const OT::AlternateSubst* -->
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
     <!-- const OT::AlternateSubstFormat1 -->
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1348'/>
+    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1354'/>
     <!-- const OT::AlternateSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
     <!-- const OT::AlternateSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1350'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1356'/>
     <!-- const OT::Anchor -->
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1351'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1357'/>
     <!-- const OT::Anchor& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
     <!-- const OT::Anchor* -->
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-1353'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1359'/>
     <!-- const OT::AnchorFormat1 -->
-    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1354'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1360'/>
     <!-- const OT::AnchorFormat1* -->
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-517'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-517'/>
     <!-- const OT::AnchorFormat2 -->
-    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1355'/>
+    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1361'/>
     <!-- const OT::AnchorFormat2* -->
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-518'/>
+    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-518'/>
     <!-- const OT::AnchorFormat3 -->
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1356'/>
+    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1362'/>
     <!-- const OT::AnchorFormat3* -->
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-519'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-519'/>
     <!-- const OT::AnchorMatrix -->
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1357'/>
+    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1363'/>
     <!-- const OT::AnchorMatrix& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
     <!-- const OT::AnchorMatrix* -->
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-524'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1359'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1365'/>
     <!-- const OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-516'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1360'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1366'/>
     <!-- const OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-463'/>
     <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1361'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1367'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1362'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1368'/>
     <!-- const OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-474'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1363'/>
+    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1369'/>
     <!-- const OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-503'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-503'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1364'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1370'/>
     <!-- const OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-521'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-521'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1365'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1371'/>
     <!-- const OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-483'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1366'/>
+    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1372'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-527'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1367'/>
+    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1373'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-444'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-444'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1368'/>
+    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1374'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-448'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1369'/>
+    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1375'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-502'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-502'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1370'/>
+    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1376'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-501'/>
+    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-501'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1371'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1377'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-506'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1372'/>
+    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1378'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-459'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1379'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-447'/>
+    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-447'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1374'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1380'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-492'/>
+    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-492'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1375'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1381'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-491'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-491'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1376'/>
+    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1382'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-482'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1377'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1383'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-513'/>
+    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-513'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1378'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1384'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-511'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1379'/>
+    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1385'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-512'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1380'/>
+    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1386'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-497'/>
+    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-497'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1381'/>
+    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1387'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-496'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1382'/>
+    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1388'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-489'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1383'/>
+    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1389'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-487'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1384'/>
+    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1390'/>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-488'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1385'/>
+    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1391'/>
     <!-- const OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-442'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1386'/>
+    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1392'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-471'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1387'/>
+    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1393'/>
     <!-- const OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-466'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1388'/>
+    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1394'/>
     <!-- const OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-462'/>
     <!-- const OT::AttachList -->
-    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1389'/>
+    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1395'/>
     <!-- const OT::AttachList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1389' size-in-bits='64' id='type-id-1390'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1395' size-in-bits='64' id='type-id-1396'/>
     <!-- const OT::AttachList* -->
-    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-1397'/>
     <!-- const OT::CaretValue -->
-    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1392'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1398'/>
     <!-- const OT::CaretValue& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
     <!-- const OT::CaretValue* -->
-    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1400'/>
     <!-- const OT::CaretValueFormat1 -->
-    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1395'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1401'/>
     <!-- const OT::CaretValueFormat1* -->
-    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-449'/>
     <!-- const OT::CaretValueFormat2 -->
-    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1396'/>
+    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1402'/>
     <!-- const OT::CaretValueFormat2* -->
-    <pointer-type-def type-id='type-id-1396' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-450'/>
     <!-- const OT::CaretValueFormat3 -->
-    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1397'/>
+    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1403'/>
     <!-- const OT::CaretValueFormat3* -->
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-453'/>
     <!-- const OT::ChainContext -->
-    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1398'/>
+    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1404'/>
     <!-- const OT::ChainContext* -->
-    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
+    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-1405'/>
     <!-- const OT::ChainContextFormat1 -->
-    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1400'/>
+    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1406'/>
     <!-- const OT::ChainContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1406' size-in-bits='64' id='type-id-1407'/>
     <!-- const OT::ChainContextFormat1* -->
-    <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
     <!-- const OT::ChainContextFormat2 -->
-    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1403'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1409'/>
     <!-- const OT::ChainContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-1404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
     <!-- const OT::ChainContextFormat2* -->
-    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-1405'/>
+    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
     <!-- const OT::ChainContextFormat3 -->
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1406'/>
+    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1412'/>
     <!-- const OT::ChainContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1406' size-in-bits='64' id='type-id-1407'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1412' size-in-bits='64' id='type-id-1413'/>
     <!-- const OT::ChainContextFormat3* -->
-    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
+    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1414'/>
     <!-- const OT::ChainRule -->
-    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1409'/>
+    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1415'/>
     <!-- const OT::ChainRule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1415' size-in-bits='64' id='type-id-1416'/>
     <!-- const OT::ChainRule* -->
-    <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
+    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1417'/>
     <!-- const OT::ChainRuleSet -->
-    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1412'/>
+    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1418'/>
     <!-- const OT::ChainRuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1412' size-in-bits='64' id='type-id-1413'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
     <!-- const OT::ChainRuleSet* -->
-    <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1420'/>
     <!-- const OT::ClassDef -->
-    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1415'/>
+    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1421'/>
     <!-- const OT::ClassDef& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1415' size-in-bits='64' id='type-id-1416'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
     <!-- const OT::ClassDef* -->
-    <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1417'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1423'/>
     <!-- const OT::ClassDefFormat1 -->
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1424'/>
     <!-- const OT::ClassDefFormat1* -->
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-457'/>
     <!-- const OT::ClassDefFormat2 -->
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1419'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1425'/>
     <!-- const OT::ClassDefFormat2* -->
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-1420'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-1426'/>
     <!-- const OT::Context -->
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1421'/>
+    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1427'/>
     <!-- const OT::Context* -->
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-1428'/>
     <!-- const OT::ContextFormat1 -->
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1429'/>
     <!-- const OT::ContextFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1423' size-in-bits='64' id='type-id-1424'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
     <!-- const OT::ContextFormat1* -->
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-1431'/>
     <!-- const OT::ContextFormat2 -->
-    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1426'/>
+    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1432'/>
     <!-- const OT::ContextFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1426' size-in-bits='64' id='type-id-1427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
     <!-- const OT::ContextFormat2* -->
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1434'/>
     <!-- const OT::ContextFormat3 -->
-    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1429'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1435'/>
     <!-- const OT::ContextFormat3& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1435' size-in-bits='64' id='type-id-1436'/>
     <!-- const OT::ContextFormat3* -->
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-500'/>
     <!-- const OT::Coverage -->
-    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1431'/>
+    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1437'/>
     <!-- const OT::Coverage& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1431' size-in-bits='64' id='type-id-943'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1437' size-in-bits='64' id='type-id-943'/>
     <!-- const OT::Coverage* -->
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-1432'/>
+    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-1438'/>
     <!-- const OT::CoverageFormat1 -->
-    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1433'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1439'/>
     <!-- const OT::CoverageFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1433' size-in-bits='64' id='type-id-1434'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
     <!-- const OT::CoverageFormat1* -->
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-1435'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1441'/>
     <!-- const OT::CoverageFormat2 -->
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1436'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1442'/>
     <!-- const OT::CoverageFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1436' size-in-bits='64' id='type-id-1437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1442' size-in-bits='64' id='type-id-1443'/>
     <!-- const OT::CoverageFormat2* -->
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-1444'/>
     <!-- const OT::CursivePos -->
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1439'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1445'/>
     <!-- const OT::CursivePos* -->
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-1446'/>
     <!-- const OT::CursivePosFormat1 -->
-    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1441'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1447'/>
     <!-- const OT::CursivePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1441' size-in-bits='64' id='type-id-1442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1447' size-in-bits='64' id='type-id-1448'/>
     <!-- const OT::CursivePosFormat1* -->
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1449'/>
     <!-- const OT::Device -->
-    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1444'/>
+    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1450'/>
     <!-- const OT::Device& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1444' size-in-bits='64' id='type-id-1445'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1450' size-in-bits='64' id='type-id-1451'/>
     <!-- const OT::Device* -->
-    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-451'/>
     <!-- const OT::EntryExitRecord -->
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1446'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1452'/>
     <!-- const OT::EntryExitRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1452' size-in-bits='64' id='type-id-1453'/>
     <!-- const OT::EntryExitRecord* -->
-    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1452' size-in-bits='64' id='type-id-1454'/>
     <!-- const OT::Extension<OT::ExtensionPos> -->
-    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1449'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1455'/>
     <!-- const OT::Extension<OT::ExtensionPos>* -->
-    <pointer-type-def type-id='type-id-1449' size-in-bits='64' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-1456'/>
     <!-- const OT::Extension<OT::ExtensionSubst> -->
-    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1451'/>
+    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1457'/>
     <!-- const OT::Extension<OT::ExtensionSubst>* -->
-    <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
+    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
     <!-- const OT::ExtensionFormat1 -->
-    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1453'/>
+    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1459'/>
     <!-- const OT::ExtensionFormat1* -->
-    <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-507'/>
+    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-507'/>
     <!-- const OT::ExtensionSubst -->
-    <qualified-type-def type-id='type-id-1454' const='yes' id='type-id-1455'/>
+    <qualified-type-def type-id='type-id-1460' const='yes' id='type-id-1461'/>
     <!-- const OT::ExtensionSubst* -->
-    <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1462'/>
     <!-- const OT::Feature -->
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1457'/>
+    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1463'/>
     <!-- const OT::Feature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
     <!-- const OT::Feature* -->
-    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-477'/>
     <!-- const OT::FeatureParams -->
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1459'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1465'/>
     <!-- const OT::FeatureParams& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
     <!-- const OT::FeatureParams* -->
-    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1467'/>
     <!-- const OT::FeatureParamsCharacterVariants -->
-    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1468'/>
     <!-- const OT::FeatureParamsCharacterVariants* -->
-    <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-475'/>
     <!-- const OT::FeatureParamsSize -->
-    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1463'/>
+    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1469'/>
     <!-- const OT::FeatureParamsSize& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
     <!-- const OT::FeatureParamsSize* -->
-    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-472'/>
     <!-- const OT::FeatureParamsStylisticSet -->
-    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1471'/>
     <!-- const OT::FeatureParamsStylisticSet* -->
-    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-473'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-473'/>
     <!-- const OT::GDEF -->
-    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1466'/>
+    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1472'/>
     <!-- const OT::GDEF& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1466' size-in-bits='64' id='type-id-1467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1472' size-in-bits='64' id='type-id-1473'/>
     <!-- const OT::GDEF* -->
-    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-1468'/>
+    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-1474'/>
     <!-- const OT::GPOS -->
-    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1469'/>
+    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1475'/>
     <!-- const OT::GPOS& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1475' size-in-bits='64' id='type-id-932'/>
     <!-- const OT::GPOS* -->
-    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-1476'/>
     <!-- const OT::GSUB -->
-    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1471'/>
+    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1477'/>
     <!-- const OT::GSUB& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-938'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1477' size-in-bits='64' id='type-id-938'/>
     <!-- const OT::GSUB* -->
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
     <!-- const OT::GSUBGPOS -->
-    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1473'/>
+    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1479'/>
     <!-- const OT::GSUBGPOS* -->
-    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1480'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1481'/>
     <!-- const OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-493'/>
     <!-- const OT::Index -->
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1476'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1482'/>
     <!-- const OT::Index& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1476' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
     <!-- const OT::Index* -->
-    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1484'/>
     <!-- const OT::IndexArray -->
-    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1485' const='yes' id='type-id-1486'/>
     <!-- const OT::IndexArray* -->
-    <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1487'/>
     <!-- const OT::LangSys -->
-    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1482'/>
+    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1488'/>
     <!-- const OT::LangSys& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
     <!-- const OT::LangSys* -->
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-464'/>
     <!-- const OT::LigCaretList -->
-    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1484'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1490'/>
     <!-- const OT::LigCaretList& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
     <!-- const OT::LigCaretList* -->
-    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1492'/>
     <!-- const OT::LigGlyph -->
-    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1487'/>
+    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1493'/>
     <!-- const OT::LigGlyph& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1487' size-in-bits='64' id='type-id-1488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <!-- const OT::LigGlyph* -->
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
     <!-- const OT::Ligature -->
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1490'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1496'/>
     <!-- const OT::Ligature& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
     <!-- const OT::Ligature* -->
-    <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1498'/>
     <!-- const OT::LigatureSet -->
-    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1499'/>
     <!-- const OT::LigatureSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
     <!-- const OT::LigatureSet* -->
-    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1501'/>
     <!-- const OT::LigatureSubst -->
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1496'/>
+    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1502'/>
     <!-- const OT::LigatureSubst* -->
-    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
     <!-- const OT::LigatureSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1504'/>
     <!-- const OT::LigatureSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
     <!-- const OT::LigatureSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1500'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1506'/>
     <!-- const OT::Lookup -->
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1501'/>
+    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1507'/>
     <!-- const OT::Lookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1501' size-in-bits='64' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
     <!-- const OT::Lookup* -->
-    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-484'/>
     <!-- const OT::LookupRecord -->
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1509'/>
     <!-- const OT::LookupRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
     <!-- const OT::LookupRecord* -->
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1505'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1511'/>
     <!-- const OT::MarkArray -->
-    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1506'/>
+    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1512'/>
     <!-- const OT::MarkArray& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1506' size-in-bits='64' id='type-id-1507'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
     <!-- const OT::MarkArray* -->
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1514'/>
     <!-- const OT::MarkBasePos -->
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1509'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1515'/>
     <!-- const OT::MarkBasePos* -->
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
+    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1516'/>
     <!-- const OT::MarkBasePosFormat1 -->
-    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1511'/>
+    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1517'/>
     <!-- const OT::MarkBasePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
     <!-- const OT::MarkBasePosFormat1* -->
-    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-526'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-526'/>
     <!-- const OT::MarkGlyphSets -->
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1513'/>
+    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1519'/>
     <!-- const OT::MarkGlyphSets& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1519' size-in-bits='64' id='type-id-1520'/>
     <!-- const OT::MarkGlyphSets* -->
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1515'/>
+    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-1521'/>
     <!-- const OT::MarkGlyphSetsFormat1 -->
-    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1522'/>
     <!-- const OT::MarkGlyphSetsFormat1* -->
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
+    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
     <!-- const OT::MarkLigPos -->
-    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1518'/>
+    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1524'/>
     <!-- const OT::MarkLigPos* -->
-    <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
     <!-- const OT::MarkLigPosFormat1 -->
-    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1520'/>
+    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1526'/>
     <!-- const OT::MarkLigPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1520' size-in-bits='64' id='type-id-1521'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1527'/>
     <!-- const OT::MarkLigPosFormat1* -->
-    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-529'/>
     <!-- const OT::MarkMarkPos -->
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1528'/>
     <!-- const OT::MarkMarkPos* -->
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
+    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
     <!-- const OT::MarkMarkPosFormat1 -->
-    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1524'/>
+    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1530'/>
     <!-- const OT::MarkMarkPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
     <!-- const OT::MarkMarkPosFormat1* -->
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-530'/>
+    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-530'/>
     <!-- const OT::MarkRecord -->
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1526'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1532'/>
     <!-- const OT::MarkRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
     <!-- const OT::MarkRecord* -->
-    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1532' size-in-bits='64' id='type-id-522'/>
     <!-- const OT::MultipleSubst -->
-    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1528'/>
+    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1534'/>
     <!-- const OT::MultipleSubst* -->
-    <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
+    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-1535'/>
     <!-- const OT::MultipleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1530'/>
+    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1536'/>
     <!-- const OT::MultipleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
     <!-- const OT::MultipleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1532'/>
+    <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1533'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1539'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1535'/>
+    <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1541'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix> -->
-    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1536'/>
+    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1542'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
     <!-- const OT::OffsetListOf<OT::AnchorMatrix>* -->
-    <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
+    <pointer-type-def type-id='type-id-1542' size-in-bits='64' id='type-id-1544'/>
     <!-- const OT::OffsetListOf<OT::Lookup> -->
-    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1539'/>
+    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1545'/>
     <!-- const OT::OffsetListOf<OT::Lookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
     <!-- const OT::OffsetListOf<OT::Lookup>* -->
-    <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1541'/>
+    <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1547'/>
     <!-- const OT::OffsetListOf<OT::PosLookup> -->
-    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1542'/>
+    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1548'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
     <!-- const OT::OffsetListOf<OT::PosLookup>* -->
-    <pointer-type-def type-id='type-id-1542' size-in-bits='64' id='type-id-1544'/>
+    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-1550'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup> -->
-    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1545'/>
+    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1551'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
     <!-- const OT::OffsetListOf<OT::SubstLookup>* -->
-    <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1547'/>
+    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1553'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1548'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1554'/>
     <!-- const OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-520'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1549'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1555'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
     <!-- const OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-525'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1551'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1557'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1558'/>
     <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-445'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1553'/>
+    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1559'/>
     <!-- const OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1553' size-in-bits='64' id='type-id-446'/>
+    <pointer-type-def type-id='type-id-1559' size-in-bits='64' id='type-id-446'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1554'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1560'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1554' size-in-bits='64' id='type-id-1555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1561'/>
     <!-- const OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-454'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1556'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1562'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1556' size-in-bits='64' id='type-id-1557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
     <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1556' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-504'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1558'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1564'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1558' size-in-bits='64' id='type-id-1559'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
     <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1558' size-in-bits='64' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-1564' size-in-bits='64' id='type-id-505'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1560'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1566'/>
     <!-- const OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-458'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1561'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1567'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1561' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1567' size-in-bits='64' id='type-id-1568'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1561' size-in-bits='64' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-443'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> > -->
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1563'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1569'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1563' size-in-bits='64' id='type-id-1564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1569' size-in-bits='64' id='type-id-1570'/>
     <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >* -->
-    <pointer-type-def type-id='type-id-1563' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-460'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1565'/>
+    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1571'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
     <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-452'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1567'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1573'/>
     <!-- const OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-479'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1568'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1574'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1568' size-in-bits='64' id='type-id-478'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1574' size-in-bits='64' id='type-id-478'/>
     <!-- const OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-476'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1569'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1575'/>
     <!-- const OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-465'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1576'/>
     <!-- const OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-456'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1571'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1577'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
     <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-455'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1573'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1579'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1573' size-in-bits='64' id='type-id-1574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
     <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-494'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1575'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1581'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1575' size-in-bits='64' id='type-id-1576'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
     <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-495'/>
+    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-495'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1577'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1583'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
     <!-- const OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-485'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1579'/>
+    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1585'/>
     <!-- const OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-523'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1580'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1586'/>
     <!-- const OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1580' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1586' size-in-bits='64' id='type-id-461'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1581'/>
+    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1587'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-528'/>
+    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-528'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1582'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1588'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1582' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-486'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1583'/>
+    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1589'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-537'/>
+    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-537'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1584'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1590'/>
     <!-- const OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1584' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-510'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1585'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1591'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1591' size-in-bits='64' id='type-id-1592'/>
     <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-515'/>
+    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-515'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1587'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1593'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1593' size-in-bits='64' id='type-id-1594'/>
     <!-- const OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-536'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1589'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1595'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
     <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-535'/>
+    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-535'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1591'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1597'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-481'/>
+    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-481'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1592'/>
+    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1598'/>
     <!-- const OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-470'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1593'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1599'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1593' size-in-bits='64' id='type-id-1594'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1599' size-in-bits='64' id='type-id-1600'/>
     <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-1599' size-in-bits='64' id='type-id-498'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1595'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1601'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1601' size-in-bits='64' id='type-id-1602'/>
     <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-499'/>
+    <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-499'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1597'/>
+    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1603'/>
     <!-- const OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1603' size-in-bits='64' id='type-id-468'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1598'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1604'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-490'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1600'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1606'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1600' size-in-bits='64' id='type-id-1601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
     <!-- const OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1600' size-in-bits='64' id='type-id-509'/>
+    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-509'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1602'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1608'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1602' size-in-bits='64' id='type-id-1603'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
     <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-508'/>
     <!-- const OT::PairPos -->
-    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1604'/>
+    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1610'/>
     <!-- const OT::PairPos* -->
-    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
     <!-- const OT::PairPosFormat1 -->
-    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1606'/>
+    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1612'/>
     <!-- const OT::PairPosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
     <!-- const OT::PairPosFormat1* -->
-    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-533'/>
+    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-533'/>
     <!-- const OT::PairPosFormat2 -->
-    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1608'/>
+    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1614'/>
     <!-- const OT::PairPosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
     <!-- const OT::PairPosFormat2* -->
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-534'/>
     <!-- const OT::PairSet -->
-    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1610'/>
+    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1616'/>
     <!-- const OT::PairSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
     <!-- const OT::PairSet* -->
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-514'/>
     <!-- const OT::PairSet::sanitize_closure_t -->
-    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1612'/>
+    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1618'/>
     <!-- const OT::PairSet::sanitize_closure_t* -->
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
+    <pointer-type-def type-id='type-id-1618' size-in-bits='64' id='type-id-1619'/>
     <!-- const OT::PosLookup -->
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1614'/>
+    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1620'/>
     <!-- const OT::PosLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-951'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1620' size-in-bits='64' id='type-id-951'/>
     <!-- const OT::PosLookup* -->
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
     <!-- const OT::PosLookupSubTable -->
-    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1616'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1622'/>
     <!-- const OT::PosLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
     <!-- const OT::PosLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-1618'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1624'/>
     <!-- const OT::RangeRecord -->
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1619'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1625'/>
     <!-- const OT::RangeRecord& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1619' size-in-bits='64' id='type-id-1620'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
     <!-- const OT::RangeRecord* -->
-    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1627'/>
     <!-- const OT::Record<OT::Feature> -->
-    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1622'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1628'/>
     <!-- const OT::Record<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1628' size-in-bits='64' id='type-id-1629'/>
     <!-- const OT::Record<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-480'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-480'/>
     <!-- const OT::Record<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1624'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1630'/>
     <!-- const OT::Record<OT::LangSys>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-1625'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
     <!-- const OT::Record<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-467'/>
     <!-- const OT::Record<OT::Script> -->
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1626'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1632'/>
     <!-- const OT::Record<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1626' size-in-bits='64' id='type-id-1627'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
     <!-- const OT::Record<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-469'/>
     <!-- const OT::RecordArrayOf<OT::Feature> -->
-    <qualified-type-def type-id='type-id-1628' const='yes' id='type-id-1629'/>
+    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
     <!-- const OT::RecordArrayOf<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1630'/>
+    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
     <!-- const OT::RecordArrayOf<OT::LangSys> -->
-    <qualified-type-def type-id='type-id-1631' const='yes' id='type-id-1632'/>
+    <qualified-type-def type-id='type-id-1637' const='yes' id='type-id-1638'/>
     <!-- const OT::RecordArrayOf<OT::LangSys>* -->
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1639'/>
     <!-- const OT::RecordArrayOf<OT::Script> -->
-    <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
+    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-1641'/>
     <!-- const OT::RecordArrayOf<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
     <!-- const OT::RecordListOf<OT::Feature> -->
-    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1637'/>
+    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1643'/>
     <!-- const OT::RecordListOf<OT::Feature>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
     <!-- const OT::RecordListOf<OT::Feature>* -->
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1639'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1645'/>
     <!-- const OT::RecordListOf<OT::Script> -->
-    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1640'/>
+    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1646'/>
     <!-- const OT::RecordListOf<OT::Script>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-1641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1646' size-in-bits='64' id='type-id-1647'/>
     <!-- const OT::RecordListOf<OT::Script>* -->
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1642'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1648'/>
     <!-- const OT::ReverseChainSingleSubst -->
-    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1643'/>
+    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1649'/>
     <!-- const OT::ReverseChainSingleSubst* -->
-    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1650'/>
     <!-- const OT::ReverseChainSingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1645'/>
+    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1651'/>
     <!-- const OT::ReverseChainSingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1645' size-in-bits='64' id='type-id-1646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
     <!-- const OT::ReverseChainSingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1647'/>
+    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1653'/>
     <!-- const OT::Rule -->
-    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1648'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1654'/>
     <!-- const OT::Rule& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
     <!-- const OT::Rule* -->
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1650'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1656'/>
     <!-- const OT::RuleSet -->
-    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1651'/>
+    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1657'/>
     <!-- const OT::RuleSet& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
     <!-- const OT::RuleSet* -->
-    <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1653'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1659'/>
     <!-- const OT::SHORT -->
-    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1654'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1660'/>
     <!-- const OT::SHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1660' size-in-bits='64' id='type-id-1661'/>
     <!-- const OT::Script -->
-    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1656'/>
+    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1662'/>
     <!-- const OT::Script& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1656' size-in-bits='64' id='type-id-1657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
     <!-- const OT::Script* -->
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1658'/>
+    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1664'/>
     <!-- const OT::Sequence -->
-    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1659'/>
+    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1665'/>
     <!-- const OT::Sequence& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1665' size-in-bits='64' id='type-id-1666'/>
     <!-- const OT::Sequence* -->
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1667'/>
     <!-- const OT::SinglePos -->
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1662'/>
+    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1668'/>
     <!-- const OT::SinglePos* -->
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1669'/>
     <!-- const OT::SinglePosFormat1 -->
-    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1664'/>
+    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1670'/>
     <!-- const OT::SinglePosFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1664' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
     <!-- const OT::SinglePosFormat1* -->
-    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-531'/>
     <!-- const OT::SinglePosFormat2 -->
-    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1666'/>
+    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1672'/>
     <!-- const OT::SinglePosFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1672' size-in-bits='64' id='type-id-1673'/>
     <!-- const OT::SinglePosFormat2* -->
-    <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-532'/>
+    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-532'/>
     <!-- const OT::SingleSubst -->
-    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1668'/>
+    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1674'/>
     <!-- const OT::SingleSubst* -->
-    <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1669'/>
+    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1675'/>
     <!-- const OT::SingleSubstFormat1 -->
-    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1670'/>
+    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1676'/>
     <!-- const OT::SingleSubstFormat1& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-1677'/>
     <!-- const OT::SingleSubstFormat1* -->
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1672'/>
+    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1678'/>
     <!-- const OT::SingleSubstFormat2 -->
-    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1673'/>
+    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1679'/>
     <!-- const OT::SingleSubstFormat2& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-1674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-1680'/>
     <!-- const OT::SingleSubstFormat2* -->
-    <pointer-type-def type-id='type-id-1673' size-in-bits='64' id='type-id-1675'/>
+    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1681'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1676' const='yes' id='type-id-1677'/>
+    <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-1683'/>
     <!-- const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1677' size-in-bits='64' id='type-id-1678'/>
+    <pointer-type-def type-id='type-id-1683' size-in-bits='64' id='type-id-1684'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1679' const='yes' id='type-id-1680'/>
+    <qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1686'/>
     <!-- const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1680' size-in-bits='64' id='type-id-1681'/>
+    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-1683'/>
+    <qualified-type-def type-id='type-id-1688' const='yes' id='type-id-1689'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1683' size-in-bits='64' id='type-id-1684'/>
+    <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-    <qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1686'/>
+    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1692'/>
     <!-- const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
+    <pointer-type-def type-id='type-id-1692' size-in-bits='64' id='type-id-1693'/>
     <!-- const OT::SubstLookup -->
-    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1688'/>
+    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1694'/>
     <!-- const OT::SubstLookup& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1688' size-in-bits='64' id='type-id-950'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-950'/>
     <!-- const OT::SubstLookup* -->
-    <pointer-type-def type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>
+    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
     <!-- const OT::SubstLookupSubTable -->
-    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1690'/>
+    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1696'/>
     <!-- const OT::SubstLookupSubTable& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1690' size-in-bits='64' id='type-id-1691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1696' size-in-bits='64' id='type-id-1697'/>
     <!-- const OT::SubstLookupSubTable* -->
-    <pointer-type-def type-id='type-id-1690' size-in-bits='64' id='type-id-1692'/>
+    <pointer-type-def type-id='type-id-1696' size-in-bits='64' id='type-id-1698'/>
     <!-- const OT::Tag& -->
-    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1699'/>
     <!-- const OT::USHORT -->
-    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1694'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1700'/>
     <!-- const OT::USHORT& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1700' size-in-bits='64' id='type-id-1701'/>
     <!-- const OT::USHORT* -->
-    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1696'/>
+    <pointer-type-def type-id='type-id-1700' size-in-bits='64' id='type-id-1702'/>
     <!-- const OT::Value -->
-    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1697'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1703'/>
     <!-- const OT::Value* -->
-    <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
     <!-- const OT::ValueFormat -->
-    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1699'/>
+    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1705'/>
     <!-- const OT::ValueFormat* -->
-    <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
+    <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
     <!-- const OT::hb_apply_context_t -->
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1701'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1707'/>
     <!-- const OT::hb_apply_context_t* -->
-    <pointer-type-def type-id='type-id-1701' size-in-bits='64' id='type-id-1702'/>
+    <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>
     <!-- const OT::hb_apply_context_t::matcher_t -->
-    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1703'/>
+    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1709'/>
     <!-- const OT::hb_apply_context_t::matcher_t* -->
-    <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
+    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t -->
-    <qualified-type-def type-id='type-id-1327' const='yes' id='type-id-1705'/>
+    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1711'/>
     <!-- const OT::hb_apply_context_t::skipping_backward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
+    <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t -->
-    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1707'/>
+    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1713'/>
     <!-- const OT::hb_apply_context_t::skipping_forward_iterator_t* -->
-    <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>
+    <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
     <!-- const OT::hb_closure_context_t -->
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1709'/>
+    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1715'/>
     <!-- const OT::hb_closure_context_t* -->
-    <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
+    <pointer-type-def type-id='type-id-1715' size-in-bits='64' id='type-id-1716'/>
     <!-- const OT::hb_collect_glyphs_context_t -->
-    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1711'/>
+    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1717'/>
     <!-- const OT::hb_collect_glyphs_context_t* -->
-    <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
+    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-1718'/>
     <!-- const OT::hb_would_apply_context_t -->
-    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1713'/>
+    <qualified-type-def type-id='type-id-1343' const='yes' id='type-id-1719'/>
     <!-- const OT::hb_would_apply_context_t* -->
-    <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
+    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
     <!-- const _hb_void_t -->
-    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1715'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1721'/>
     <!-- const _hb_void_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1715' size-in-bits='64' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-946'/>
     <!-- const bool -->
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-931'/>
     <!-- const hb_glyph_info_t* -->
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1716'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1722'/>
     <!-- const hb_ot_layout_lookup_accelerator_t -->
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1717'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1723'/>
     <!-- const hb_ot_layout_lookup_accelerator_t* -->
-    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-933'/>
     <!-- const hb_ot_map_t -->
-    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1718'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1724'/>
     <!-- const hb_ot_map_t* -->
-    <pointer-type-def type-id='type-id-1718' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-960'/>
     <!-- const hb_ot_map_t::feature_map_t -->
-    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1719'/>
+    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1725'/>
     <!-- const hb_ot_map_t::feature_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1725' size-in-bits='64' id='type-id-1726'/>
     <!-- const hb_ot_map_t::feature_map_t* -->
-    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-954'/>
+    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-954'/>
     <!-- const hb_ot_map_t::lookup_map_t -->
-    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1721'/>
+    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1727'/>
     <!-- const hb_ot_map_t::lookup_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-973'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-973'/>
     <!-- const hb_ot_map_t::lookup_map_t* -->
-    <pointer-type-def type-id='type-id-1721' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-955'/>
     <!-- const hb_ot_map_t::lookup_map_t** -->
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-965'/>
     <!-- const hb_ot_map_t::stage_map_t -->
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1728'/>
     <!-- const hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-978'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1728' size-in-bits='64' id='type-id-978'/>
     <!-- const hb_ot_shape_plan_t -->
-    <qualified-type-def type-id='type-id-1723' const='yes' id='type-id-1724'/>
+    <qualified-type-def type-id='type-id-1729' const='yes' id='type-id-1730'/>
     <!-- const hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-962'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> -->
-    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1725'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1731'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
-    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-969'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u> -->
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1726'/>
+    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1732'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::lookup_map_t, 32u>* -->
-    <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-972'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u> -->
-    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1727'/>
+    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1733'/>
     <!-- const hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-977'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > -->
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1728'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1734'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> >* -->
-    <pointer-type-def type-id='type-id-1728' size-in-bits='64' id='type-id-983'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-983'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > > -->
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1729'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1735'/>
     <!-- const hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 4u>, hb_set_digest_combiner_t<hb_set_digest_lowest_bits_t<long unsigned int, 0u>, hb_set_digest_lowest_bits_t<long unsigned int, 9u> > >* -->
-    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-988'/>
+    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-988'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u> -->
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1730'/>
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1736'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 0u>* -->
-    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-989'/>
+    <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-989'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u> -->
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1731'/>
+    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1737'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 4u>* -->
-    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-991'/>
+    <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-991'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u> -->
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1732'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1738'/>
     <!-- const hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-993'/>
+    <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-993'/>
     <!-- const hb_set_digest_t -->
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1733'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1739'/>
     <!-- const hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-1734'/>
+    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
     <!-- const hb_tag_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1735'/>
+    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1741'/>
     <!-- const hb_tag_t* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1736'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1742'/>
     <!-- hb_auto_trace_t<0, const OT::Coverage&>* -->
     <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-942'/>
     <!-- hb_auto_trace_t<0, const _hb_void_t&>* -->
@@ -15687,7 +15693,7 @@
     <!-- hb_ot_map_t::lookup_map_t* -->
     <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-971'/>
     <!-- hb_ot_map_t::stage_map_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1743'/>
     <!-- hb_ot_map_t::stage_map_t* -->
     <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-976'/>
     <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
@@ -15707,16 +15713,10 @@
     <!-- hb_set_digest_lowest_bits_t<long unsigned int, 9u>* -->
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-994'/>
     <!-- hb_set_digest_t* -->
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1738'/>
-    <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
-    <!-- typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1741' size-in-bits='64' id='type-id-1742'/>
-    <!-- typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* -->
-    <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1744'/>
-    <!-- void (const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*)* -->
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1744'/>
+    <!-- void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
     <pointer-type-def type-id='type-id-1745' size-in-bits='64' id='type-id-957'/>
-    <!-- void (hb_set_t*, const OT::USHORT&, void*)* -->
+    <!-- void(*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
@@ -15760,7 +15760,7 @@
     <!-- const OT::Record<OT::Script>::sanitize_closure_t* -->
     <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1814'/>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
@@ -15828,9 +15828,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -15841,9 +15841,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -15883,9 +15883,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -15894,9 +15894,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -15905,7 +15905,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -15916,9 +15916,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -15927,9 +15927,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -15949,9 +15949,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::AlternateSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubst*' -->
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -15979,9 +15979,9 @@
           <!-- bool OT::AlternateSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT21AlternateSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -15990,7 +15990,7 @@
           <!-- const OT::Coverage& OT::AlternateSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT21AlternateSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -15999,9 +15999,9 @@
           <!-- void OT::AlternateSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT21AlternateSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -16010,9 +16010,9 @@
           <!-- void OT::AlternateSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT21AlternateSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -16032,7 +16032,7 @@
           <!-- bool OT::AlternateSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT21AlternateSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AlternateSubstFormat1*' -->
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -16086,9 +16086,9 @@
           <!-- void OT::Anchor::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
           <function-decl name='get_anchor' mangled-name='_ZNK2OT6Anchor10get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Anchor*' -->
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1359' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16139,7 +16139,7 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat1*' -->
             <parameter type-id='type-id-517' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16194,7 +16194,7 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat2*' -->
             <parameter type-id='type-id-518' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16253,7 +16253,7 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat3*' -->
             <parameter type-id='type-id-519' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'hb_position_t*' -->
@@ -16304,9 +16304,9 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'bool*' -->
-            <parameter type-id='type-id-1343'/>
+            <parameter type-id='type-id-1349'/>
             <!-- const OT::Anchor& -->
-            <return type-id='type-id-1352'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16356,7 +16356,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::EntryExitRecord& -->
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1453'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16384,7 +16384,7 @@
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-60'/>
             <!-- const OT::Index* -->
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16395,7 +16395,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Index& -->
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1483'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16543,7 +16543,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::MarkRecord& -->
-            <return type-id='type-id-1527'/>
+            <return type-id='type-id-1533'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16669,7 +16669,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1552'/>
+            <return type-id='type-id-1558'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16771,7 +16771,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1557'/>
+            <return type-id='type-id-1563'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16821,7 +16821,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1559'/>
+            <return type-id='type-id-1565'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16880,7 +16880,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1562'/>
+            <return type-id='type-id-1568'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -16930,7 +16930,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >& -->
-            <return type-id='type-id-1564'/>
+            <return type-id='type-id-1570'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17004,7 +17004,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1572'/>
+            <return type-id='type-id-1578'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17030,7 +17030,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1574'/>
+            <return type-id='type-id-1580'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17113,7 +17113,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1576'/>
+            <return type-id='type-id-1582'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17261,7 +17261,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1586'/>
+            <return type-id='type-id-1592'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17341,7 +17341,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1590'/>
+            <return type-id='type-id-1596'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17378,7 +17378,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1594'/>
+            <return type-id='type-id-1600'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17428,7 +17428,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1596'/>
+            <return type-id='type-id-1602'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17478,7 +17478,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1599'/>
+            <return type-id='type-id-1605'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17582,7 +17582,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1603'/>
+            <return type-id='type-id-1609'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17630,7 +17630,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::RangeRecord& -->
-            <return type-id='type-id-1620'/>
+            <return type-id='type-id-1626'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -17698,7 +17698,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::Feature>& -->
-            <return type-id='type-id-1623'/>
+            <return type-id='type-id-1629'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17761,7 +17761,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::LangSys>& -->
-            <return type-id='type-id-1625'/>
+            <return type-id='type-id-1631'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17824,7 +17824,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Record<OT::Script>& -->
-            <return type-id='type-id-1627'/>
+            <return type-id='type-id-1633'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17883,7 +17883,7 @@
           <!-- unsigned int OT::AttachList::get_attach_points(hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT10AttachList17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::AttachList*' -->
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1397' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -17956,9 +17956,9 @@
           <!-- hb_position_t OT::CaretValue::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT10CaretValue15get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CaretValue*' -->
-            <parameter type-id='type-id-1394' is-artificial='yes'/>
+            <parameter type-id='type-id-1400' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18003,7 +18003,7 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat1*' -->
             <parameter type-id='type-id-449' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18048,7 +18048,7 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat2*' -->
             <parameter type-id='type-id-450' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18097,7 +18097,7 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat3*' -->
             <parameter type-id='type-id-453' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -18138,9 +18138,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -18149,9 +18149,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::ChainContext::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18160,9 +18160,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18171,9 +18171,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ChainContext::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18193,7 +18193,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::ChainContext::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -18204,9 +18204,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::ChainContext::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContext*' -->
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18267,7 +18267,7 @@
           <!-- const OT::Coverage& OT::ChainContextFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1858' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18276,9 +18276,9 @@
           <!-- void OT::ChainContextFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1813' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18287,9 +18287,9 @@
           <!-- bool OT::ChainContextFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1846' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18309,7 +18309,7 @@
           <!-- bool OT::ChainContextFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1863' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18320,9 +18320,9 @@
           <!-- void OT::ChainContextFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1831' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat1*' -->
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18362,7 +18362,7 @@
           <!-- const OT::Coverage& OT::ChainContextFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1961' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18371,9 +18371,9 @@
           <!-- bool OT::ChainContextFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1942' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18393,7 +18393,7 @@
           <!-- bool OT::ChainContextFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1966' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18404,9 +18404,9 @@
           <!-- void OT::ChainContextFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1896' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18415,9 +18415,9 @@
           <!-- void OT::ChainContextFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1921' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat2*' -->
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18453,7 +18453,7 @@
           <!-- const OT::Coverage& OT::ChainContextFormat3::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2081' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -18462,9 +18462,9 @@
           <!-- void OT::ChainContextFormat3::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2020' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18473,9 +18473,9 @@
           <!-- bool OT::ChainContextFormat3::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18495,7 +18495,7 @@
           <!-- bool OT::ChainContextFormat3::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2087' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -18506,9 +18506,9 @@
           <!-- void OT::ChainContextFormat3::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2042' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainContextFormat3*' -->
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -18550,9 +18550,9 @@
           <!-- void OT::ChainRule::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT9ChainRule7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1675' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
             <parameter type-id='type-id-1085'/>
             <!-- void -->
@@ -18563,9 +18563,9 @@
           <!-- bool OT::ChainRule::would_apply(OT::hb_would_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT9ChainRule11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1703' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
             <parameter type-id='type-id-1083'/>
             <!-- bool -->
@@ -18587,7 +18587,7 @@
           <!-- bool OT::ChainRule::apply(OT::hb_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT9ChainRule5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1716' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
@@ -18600,9 +18600,9 @@
           <!-- void OT::ChainRule::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ChainContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9ChainRule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1689' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRule*' -->
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1087'/>
             <!-- void -->
@@ -18635,9 +18635,9 @@
           <!-- bool OT::ChainRuleSet::would_apply(OT::hb_would_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT12ChainRuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1776' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
             <parameter type-id='type-id-1083'/>
             <!-- bool -->
@@ -18648,9 +18648,9 @@
           <!-- void OT::ChainRuleSet::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT12ChainRuleSet7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1760' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ChainContextClosureLookupContext&' -->
             <parameter type-id='type-id-1085'/>
             <!-- void -->
@@ -18661,9 +18661,9 @@
           <!-- void OT::ChainRuleSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ChainContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT12ChainRuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1768' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ChainContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1087'/>
             <!-- void -->
@@ -18674,7 +18674,7 @@
           <!-- bool OT::ChainRuleSet::apply(OT::hb_apply_context_t*, OT::ChainContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT12ChainRuleSet5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ChainRuleSet*' -->
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ChainContextApplyLookupContext&' -->
@@ -18726,7 +18726,7 @@
           <!-- unsigned int OT::ClassDef::get_class(hb_codepoint_t) -->
           <function-decl name='get_class' mangled-name='_ZNK2OT8ClassDef9get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1050' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -18737,7 +18737,7 @@
           <!-- bool OT::ClassDef::intersects_class(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_class' mangled-name='_ZNK2OT8ClassDef16intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1077' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18750,7 +18750,7 @@
           <!-- void OT::ClassDef::add_class(hb_set_t*, unsigned int) -->
           <function-decl name='add_class' mangled-name='_ZNK2OT8ClassDef9add_classEP8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1069' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18835,7 +18835,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::ClassDefFormat2::rangeRecord -->
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDefFormat2::min_size -->
@@ -18845,7 +18845,7 @@
           <!-- void OT::ClassDefFormat2::add_class<hb_set_t>(hb_set_t*, unsigned int) -->
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1008' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18858,7 +18858,7 @@
           <!-- unsigned int OT::ClassDefFormat2::get_class(hb_codepoint_t) -->
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat29get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='994' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -18880,7 +18880,7 @@
           <!-- bool OT::ClassDefFormat2::intersects_class(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat216intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1015' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -18921,9 +18921,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::Context::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -18932,9 +18932,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::Context::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18943,9 +18943,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -18954,9 +18954,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Context::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -18976,7 +18976,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::Context::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -18987,9 +18987,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::Context::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Context*' -->
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -19071,7 +19071,7 @@
           <!-- const OT::Coverage& OT::ContextFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19080,9 +19080,9 @@
           <!-- void OT::ContextFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1251' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19091,9 +19091,9 @@
           <!-- bool OT::ContextFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19113,7 +19113,7 @@
           <!-- bool OT::ContextFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1302' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -19124,9 +19124,9 @@
           <!-- void OT::ContextFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat1*' -->
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19158,7 +19158,7 @@
           <!-- const OT::Coverage& OT::ContextFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19167,9 +19167,9 @@
           <!-- bool OT::ContextFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1374' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19189,7 +19189,7 @@
           <!-- bool OT::ContextFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -19200,9 +19200,9 @@
           <!-- void OT::ContextFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19211,9 +19211,9 @@
           <!-- void OT::ContextFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ContextFormat2*' -->
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19260,7 +19260,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19271,7 +19271,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -19304,7 +19304,7 @@
             <!-- implicit parameter of type 'const OT::ContextFormat3*' -->
             <parameter type-id='type-id-500' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19433,9 +19433,9 @@
           <!-- void OT::Coverage::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19444,7 +19444,7 @@
           <!-- bool OT::Coverage::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT8Coverage19intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19457,7 +19457,7 @@
           <!-- unsigned int OT::Coverage::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT8Coverage12get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='808' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19468,7 +19468,7 @@
           <!-- void OT::Coverage::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' mangled-name='_ZNK2OT8Coverage12add_coverageI8hb_set_tEEvPT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19479,7 +19479,7 @@
           <!-- bool OT::Coverage::intersects(const hb_set_t*) -->
           <function-decl name='intersects' mangled-name='_ZNK2OT8Coverage10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='845' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Coverage*' -->
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- bool -->
@@ -19503,7 +19503,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-1845' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19531,7 +19531,7 @@
           <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1125'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat1* OT::CoverageFormat1::Iter::c -->
-              <var-decl name='c' type-id='type-id-1435' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-1441' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat1::Iter::i -->
@@ -19561,7 +19561,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
                 <parameter type-id='type-id-1126' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat1&' -->
-                <parameter type-id='type-id-1434'/>
+                <parameter type-id='type-id-1440'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -19592,7 +19592,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat1::glyphArray -->
-          <var-decl name='glyphArray' type-id='type-id-1676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
+          <var-decl name='glyphArray' type-id='type-id-1682' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat1::min_size -->
@@ -19602,9 +19602,9 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19613,7 +19613,7 @@
           <!-- void OT::CoverageFormat1::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19624,7 +19624,7 @@
           <!-- unsigned int OT::CoverageFormat1::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat112get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19635,7 +19635,7 @@
           <!-- bool OT::CoverageFormat1::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat119intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='659' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19661,7 +19661,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-1846' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19689,7 +19689,7 @@
           <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1128'>
             <data-member access='private' layout-offset-in-bits='0'>
               <!-- const OT::CoverageFormat2* OT::CoverageFormat2::Iter::c -->
-              <var-decl name='c' type-id='type-id-1438' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-1444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <!-- unsigned int OT::CoverageFormat2::Iter::i -->
@@ -19727,7 +19727,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
                 <parameter type-id='type-id-1129' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::CoverageFormat2&' -->
-                <parameter type-id='type-id-1437'/>
+                <parameter type-id='type-id-1443'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -19758,7 +19758,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > OT::CoverageFormat2::rangeRecord -->
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat2::min_size -->
@@ -19768,9 +19768,9 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19779,7 +19779,7 @@
           <!-- void OT::CoverageFormat2::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -19790,7 +19790,7 @@
           <!-- unsigned int OT::CoverageFormat2::get_coverage(hb_codepoint_t) -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat212get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -19801,7 +19801,7 @@
           <!-- bool OT::CoverageFormat2::intersects_coverage(const hb_set_t*, unsigned int) -->
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat219intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- parameter of type 'unsigned int' -->
@@ -19827,7 +19827,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-1847' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19871,9 +19871,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::CursivePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -19882,7 +19882,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::CursivePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -19893,9 +19893,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::CursivePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePos*' -->
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -19934,7 +19934,7 @@
           <!-- const OT::Coverage& OT::CursivePosFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17CursivePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -19943,9 +19943,9 @@
           <!-- void OT::CursivePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17CursivePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -19965,7 +19965,7 @@
           <!-- bool OT::CursivePosFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT17CursivePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='887' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::CursivePosFormat1*' -->
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -20032,7 +20032,7 @@
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- typedef hb_position_t -->
             <return type-id='type-id-103'/>
           </function-decl>
@@ -20043,7 +20043,7 @@
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- typedef hb_position_t -->
             <return type-id='type-id-103'/>
           </function-decl>
@@ -20104,18 +20104,18 @@
           <!-- const OT::PosLookupSubTable& OT::Extension<OT::ExtensionPos>::get_subtable<OT::PosLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::PosLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20124,7 +20124,7 @@
           <!-- unsigned int OT::Extension<OT::ExtensionPos>::get_offset() -->
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20133,7 +20133,7 @@
           <!-- unsigned int OT::Extension<OT::ExtensionPos>::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20153,9 +20153,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20164,7 +20164,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionPos>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionPos>*' -->
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -20206,18 +20206,18 @@
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_would_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -20226,9 +20226,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20237,9 +20237,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -20248,7 +20248,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -20259,9 +20259,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20270,7 +20270,7 @@
           <!-- unsigned int OT::Extension<OT::ExtensionSubst>::get_offset() -->
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20279,7 +20279,7 @@
           <!-- unsigned int OT::Extension<OT::ExtensionSubst>::get_type() -->
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20310,18 +20310,18 @@
           <!-- const OT::SubstLookupSubTable& OT::Extension<OT::ExtensionSubst>::get_subtable<OT::SubstLookupSubTable>() -->
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- OT::hb_get_coverage_context_t::return_t OT::Extension<OT::ExtensionSubst>::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Extension<OT::ExtensionSubst>*' -->
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -20385,14 +20385,14 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1139'/>
       </class-decl>
       <!-- struct OT::ExtensionSubst -->
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1454'>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1460'>
         <!-- struct OT::Extension<OT::ExtensionSubst> -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1141'/>
         <member-function access='public'>
           <!-- bool OT::ExtensionSubst::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT14ExtensionSubst10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='924' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ExtensionSubst*' -->
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20406,7 +20406,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
           <!-- OT::IndexArray OT::Feature::lookupIndex -->
-          <var-decl name='lookupIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Feature::min_size -->
@@ -20431,7 +20431,7 @@
             <!-- implicit parameter of type 'const OT::Feature*' -->
             <parameter type-id='type-id-477' is-artificial='yes'/>
             <!-- const OT::FeatureParams& -->
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -20498,11 +20498,11 @@
           <!-- const OT::FeatureParamsSize& OT::FeatureParams::get_size_params(hb_tag_t) -->
           <function-decl name='get_size_params' mangled-name='_ZNK2OT13FeatureParams15get_size_paramsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::FeatureParams*' -->
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- const OT::FeatureParamsSize& -->
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1470'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -20662,7 +20662,7 @@
           <!-- bool OT::GDEF::has_glyph_classes() -->
           <function-decl name='has_glyph_classes' mangled-name='_ZNK2OT4GDEF17has_glyph_classesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -20671,7 +20671,7 @@
           <!-- bool OT::GDEF::mark_set_covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='mark_set_covers' mangled-name='_ZNK2OT4GDEF15mark_set_coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -20684,7 +20684,7 @@
           <!-- unsigned int OT::GDEF::get_glyph_class(hb_codepoint_t) -->
           <function-decl name='get_glyph_class' mangled-name='_ZNK2OT4GDEF15get_glyph_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20695,7 +20695,7 @@
           <!-- unsigned int OT::GDEF::get_mark_attachment_type(hb_codepoint_t) -->
           <function-decl name='get_mark_attachment_type' mangled-name='_ZNK2OT4GDEF24get_mark_attachment_typeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20706,9 +20706,9 @@
           <!-- unsigned int OT::GDEF::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT4GDEF14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -20727,7 +20727,7 @@
           <!-- unsigned int OT::GDEF::get_attach_points(hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT4GDEF17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -20744,7 +20744,7 @@
           <!-- void OT::GDEF::get_glyphs_in_class(unsigned int, hb_set_t*) -->
           <function-decl name='get_glyphs_in_class' mangled-name='_ZNK2OT4GDEF19get_glyphs_in_classEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -20757,7 +20757,7 @@
           <!-- unsigned int OT::GDEF::get_glyph_props(hb_codepoint_t) -->
           <function-decl name='get_glyph_props' mangled-name='_ZNK2OT4GDEF15get_glyph_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GDEF*' -->
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- unsigned int -->
@@ -20796,9 +20796,9 @@
           <!-- void OT::GPOS::position_finish(hb_buffer_t*) -->
           <function-decl name='position_finish' mangled-name='_ZN2OT4GPOS15position_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1524' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20807,9 +20807,9 @@
           <!-- void OT::GPOS::position_start(hb_buffer_t*) -->
           <function-decl name='position_start' mangled-name='_ZN2OT4GPOS14position_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1523' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20818,7 +20818,7 @@
           <!-- const OT::PosLookup& OT::GPOS::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1520' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GPOS*' -->
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::PosLookup& -->
@@ -20857,9 +20857,9 @@
           <!-- void OT::GSUB::substitute_finish(hb_buffer_t*) -->
           <function-decl name='substitute_finish' mangled-name='_ZN2OT4GSUB17substitute_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1325' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20868,9 +20868,9 @@
           <!-- void OT::GSUB::substitute_start(hb_buffer_t*) -->
           <function-decl name='substitute_start' mangled-name='_ZN2OT4GSUB16substitute_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -20879,7 +20879,7 @@
           <!-- const OT::SubstLookup& OT::GSUB::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GSUB10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1321' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUB*' -->
-            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::SubstLookup& -->
@@ -20936,18 +20936,18 @@
           <!-- const OT::Lookup& OT::GSUBGPOS::get_lookup(unsigned int) -->
           <function-decl name='get_lookup' mangled-name='_ZNK2OT8GSUBGPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2291' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::GSUBGPOS::get_feature_count() -->
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT8GSUBGPOS17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -20956,18 +20956,18 @@
           <!-- const OT::Feature& OT::GSUBGPOS::get_feature(unsigned int) -->
           <function-decl name='get_feature' mangled-name='_ZNK2OT8GSUBGPOS11get_featureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2284' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::GSUBGPOS::get_feature_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_feature_tags' mangled-name='_ZNK2OT8GSUBGPOS16get_feature_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2280' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20982,7 +20982,7 @@
           <!-- unsigned int OT::GSUBGPOS::get_script_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_script_tags' mangled-name='_ZNK2OT8GSUBGPOS15get_script_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2267' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -20997,7 +20997,7 @@
           <!-- unsigned int OT::GSUBGPOS::get_lookup_count() -->
           <function-decl name='get_lookup_count' mangled-name='_ZNK2OT8GSUBGPOS16get_lookup_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -21006,7 +21006,7 @@
           <!-- bool OT::GSUBGPOS::find_script_index(hb_tag_t, unsigned int*) -->
           <function-decl name='find_script_index' mangled-name='_ZNK2OT8GSUBGPOS17find_script_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -21019,18 +21019,18 @@
           <!-- const OT::Script& OT::GSUBGPOS::get_script(unsigned int) -->
           <function-decl name='get_script' mangled-name='_ZNK2OT8GSUBGPOS10get_scriptEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2271' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- hb_tag_t OT::GSUBGPOS::get_feature_tag(unsigned int) -->
           <function-decl name='get_feature_tag' mangled-name='_ZNK2OT8GSUBGPOS15get_feature_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2278' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::GSUBGPOS*' -->
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef hb_tag_t -->
@@ -21131,14 +21131,14 @@
         </data-member>
       </class-decl>
       <!-- struct OT::IndexArray -->
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1479'>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1485'>
         <!-- struct OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
         <member-function access='public'>
           <!-- unsigned int OT::IndexArray::get_indexes(unsigned int, unsigned int*, unsigned int*) -->
           <function-decl name='get_indexes' mangled-name='_ZNK2OT10IndexArray11get_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::IndexArray*' -->
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
+            <parameter type-id='type-id-1487' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -21164,7 +21164,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
           <!-- OT::IndexArray OT::LangSys::featureIndex -->
-          <var-decl name='featureIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LangSys::min_size -->
@@ -21266,9 +21266,9 @@
           <!-- unsigned int OT::LigCaretList::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT12LigCaretList14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigCaretList*' -->
-            <parameter type-id='type-id-1486' is-artificial='yes'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -21309,9 +21309,9 @@
           <!-- unsigned int OT::LigGlyph::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT8LigGlyph14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigGlyph*' -->
-            <parameter type-id='type-id-1489' is-artificial='yes'/>
+            <parameter type-id='type-id-1495' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -21345,9 +21345,9 @@
           <!-- void OT::Ligature::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT8Ligature7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21356,9 +21356,9 @@
           <!-- void OT::Ligature::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Ligature14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21367,9 +21367,9 @@
           <!-- bool OT::Ligature::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT8Ligature11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21389,7 +21389,7 @@
           <!-- bool OT::Ligature::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT8Ligature5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Ligature*' -->
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21428,9 +21428,9 @@
           <!-- void OT::LigatureSet::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT11LigatureSet7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21439,9 +21439,9 @@
           <!-- void OT::LigatureSet::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11LigatureSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21450,9 +21450,9 @@
           <!-- bool OT::LigatureSet::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT11LigatureSet11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21472,7 +21472,7 @@
           <!-- bool OT::LigatureSet::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT11LigatureSet5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSet*' -->
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21522,9 +21522,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21533,9 +21533,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -21544,7 +21544,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -21555,9 +21555,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21566,9 +21566,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21588,9 +21588,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::LigatureSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubst*' -->
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21641,7 +21641,7 @@
           <!-- const OT::Coverage& OT::LigatureSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20LigatureSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='802' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -21650,9 +21650,9 @@
           <!-- void OT::LigatureSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT20LigatureSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21661,9 +21661,9 @@
           <!-- void OT::LigatureSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20LigatureSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -21672,9 +21672,9 @@
           <!-- bool OT::LigatureSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT20LigatureSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='807' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -21694,7 +21694,7 @@
           <!-- bool OT::LigatureSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT20LigatureSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::LigatureSubstFormat1*' -->
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -21841,7 +21841,7 @@
           <!-- bool OT::MarkArray::apply(OT::hb_apply_context_t*, unsigned int, unsigned int, const OT::AnchorMatrix&, unsigned int, unsigned int) -->
           <function-decl name='apply' mangled-name='_ZNK2OT9MarkArray5applyEPNS_18hb_apply_context_tEjjRKNS_12AnchorMatrixEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='393' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkArray*' -->
-            <parameter type-id='type-id-1508' is-artificial='yes'/>
+            <parameter type-id='type-id-1514' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -21849,7 +21849,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'const OT::AnchorMatrix&' -->
-            <parameter type-id='type-id-1358'/>
+            <parameter type-id='type-id-1364'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int' -->
@@ -21882,9 +21882,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -21893,7 +21893,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -21904,9 +21904,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkBasePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkBasePos*' -->
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -21972,7 +21972,7 @@
             <!-- implicit parameter of type 'const OT::MarkBasePosFormat1*' -->
             <parameter type-id='type-id-526' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22027,7 +22027,7 @@
           <!-- bool OT::MarkGlyphSets::covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='covers' mangled-name='_ZNK2OT13MarkGlyphSets6coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkGlyphSets*' -->
-            <parameter type-id='type-id-1515' is-artificial='yes'/>
+            <parameter type-id='type-id-1521' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -22066,7 +22066,7 @@
           <!-- bool OT::MarkGlyphSetsFormat1::covers(unsigned int, hb_codepoint_t) -->
           <function-decl name='covers' mangled-name='_ZNK2OT20MarkGlyphSetsFormat16coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkGlyphSetsFormat1*' -->
-            <parameter type-id='type-id-1517' is-artificial='yes'/>
+            <parameter type-id='type-id-1523' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -22110,9 +22110,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22121,7 +22121,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22132,9 +22132,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkLigPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkLigPos*' -->
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22200,7 +22200,7 @@
             <!-- implicit parameter of type 'const OT::MarkLigPosFormat1*' -->
             <parameter type-id='type-id-529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22251,9 +22251,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22262,7 +22262,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22273,9 +22273,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MarkMarkPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MarkMarkPos*' -->
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22341,7 +22341,7 @@
             <!-- implicit parameter of type 'const OT::MarkMarkPosFormat1*' -->
             <parameter type-id='type-id-530' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22424,9 +22424,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22435,9 +22435,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -22446,7 +22446,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -22457,9 +22457,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22468,9 +22468,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -22490,9 +22490,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::MultipleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubst*' -->
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -22520,9 +22520,9 @@
           <!-- bool OT::MultipleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT20MultipleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22531,7 +22531,7 @@
           <!-- const OT::Coverage& OT::MultipleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20MultipleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -22540,9 +22540,9 @@
           <!-- void OT::MultipleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT20MultipleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22551,9 +22551,9 @@
           <!-- void OT::MultipleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20MultipleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -22573,7 +22573,7 @@
           <!-- bool OT::MultipleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT20MultipleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::MultipleSubstFormat1*' -->
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -22597,7 +22597,7 @@
           <!-- bool OT::Offset<OT::IntType<short unsigned int, 2u> >::is_null() -->
           <function-decl name='is_null' mangled-name='_ZNK2OT6OffsetINS_7IntTypeItLj2EEEE7is_nullEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Offset<OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1541' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -22704,11 +22704,11 @@
           <!-- const OT::AnchorMatrix& OT::OffsetListOf<OT::AnchorMatrix>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_12AnchorMatrixEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetListOf<OT::AnchorMatrix>*' -->
-            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::AnchorMatrix& -->
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -22720,11 +22720,11 @@
           <!-- const OT::Lookup& OT::OffsetListOf<OT::Lookup>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_6LookupEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::OffsetListOf<OT::Lookup>*' -->
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
+            <parameter type-id='type-id-1547' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22791,7 +22791,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Anchor& -->
-            <return type-id='type-id-1352'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22839,7 +22839,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::AnchorMatrix& -->
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22889,7 +22889,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1361'/>
+            <return type-id='type-id-1367'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22937,7 +22937,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::AttachList& -->
-            <return type-id='type-id-1390'/>
+            <return type-id='type-id-1396'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22985,7 +22985,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::CaretValue& -->
-            <return type-id='type-id-1393'/>
+            <return type-id='type-id-1399'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23033,7 +23033,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ChainRule& -->
-            <return type-id='type-id-1410'/>
+            <return type-id='type-id-1416'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23081,7 +23081,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ChainRuleSet& -->
-            <return type-id='type-id-1413'/>
+            <return type-id='type-id-1419'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23129,7 +23129,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::ClassDef& -->
-            <return type-id='type-id-1416'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23286,7 +23286,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Device& -->
-            <return type-id='type-id-1445'/>
+            <return type-id='type-id-1451'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23349,7 +23349,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23399,7 +23399,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::FeatureParams& -->
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23449,7 +23449,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23497,7 +23497,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigCaretList& -->
-            <return type-id='type-id-1485'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23545,7 +23545,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigGlyph& -->
-            <return type-id='type-id-1488'/>
+            <return type-id='type-id-1494'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23593,7 +23593,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Ligature& -->
-            <return type-id='type-id-1491'/>
+            <return type-id='type-id-1497'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23654,7 +23654,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::LigatureSet& -->
-            <return type-id='type-id-1494'/>
+            <return type-id='type-id-1500'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23715,7 +23715,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Lookup& -->
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23763,7 +23763,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::MarkArray& -->
-            <return type-id='type-id-1507'/>
+            <return type-id='type-id-1513'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23811,7 +23811,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::MarkGlyphSets& -->
-            <return type-id='type-id-1514'/>
+            <return type-id='type-id-1520'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23874,7 +23874,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::OffsetListOf<OT::AnchorMatrix>& -->
-            <return type-id='type-id-1537'/>
+            <return type-id='type-id-1543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -23909,7 +23909,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::OffsetListOf<OT::Lookup>& -->
-            <return type-id='type-id-1540'/>
+            <return type-id='type-id-1546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24046,7 +24046,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::PairSet& -->
-            <return type-id='type-id-1611'/>
+            <return type-id='type-id-1617'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24133,7 +24133,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24168,7 +24168,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RecordListOf<OT::Feature>& -->
-            <return type-id='type-id-1638'/>
+            <return type-id='type-id-1644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24216,7 +24216,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RecordListOf<OT::Script>& -->
-            <return type-id='type-id-1641'/>
+            <return type-id='type-id-1647'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24264,7 +24264,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Rule& -->
-            <return type-id='type-id-1649'/>
+            <return type-id='type-id-1655'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24312,7 +24312,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::RuleSet& -->
-            <return type-id='type-id-1652'/>
+            <return type-id='type-id-1658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24375,7 +24375,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24410,7 +24410,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::Sequence& -->
-            <return type-id='type-id-1660'/>
+            <return type-id='type-id-1666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24510,7 +24510,7 @@
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24565,9 +24565,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::PairPos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -24576,7 +24576,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::PairPos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -24587,9 +24587,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PairPos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PairPos*' -->
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -24658,7 +24658,7 @@
             <!-- implicit parameter of type 'const OT::PairPosFormat1*' -->
             <parameter type-id='type-id-533' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24732,7 +24732,7 @@
             <!-- implicit parameter of type 'const OT::PairPosFormat2*' -->
             <parameter type-id='type-id-534' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24803,7 +24803,7 @@
             <!-- parameter of type 'OT::hb_sanitize_context_t*' -->
             <parameter type-id='type-id-277'/>
             <!-- parameter of type 'const OT::PairSet::sanitize_closure_t*' -->
-            <parameter type-id='type-id-1613'/>
+            <parameter type-id='type-id-1619'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24816,7 +24816,7 @@
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1706'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- bool -->
@@ -24829,9 +24829,9 @@
             <!-- implicit parameter of type 'const OT::PairSet*' -->
             <parameter type-id='type-id-514' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1706'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24845,9 +24845,9 @@
           <!-- void OT::PosLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -24856,9 +24856,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -24867,7 +24867,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::PosLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -24878,18 +24878,18 @@
           <!-- const OT::PosLookupSubTable& OT::PosLookup::get_subtable(unsigned int) -->
           <function-decl name='get_subtable' mangled-name='_ZNK2OT9PosLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1445' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::PosLookupSubTable& -->
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::PosLookup::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT9PosLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1448' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -24898,7 +24898,7 @@
           <!-- bool OT::PosLookup::apply_once(OT::hb_apply_context_t*) -->
           <function-decl name='apply_once' mangled-name='_ZNK2OT9PosLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1475' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -24920,9 +24920,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookup::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9PosLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1453' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookup*' -->
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25013,9 +25013,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -25026,9 +25026,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -25039,7 +25039,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::PosLookupSubTable::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::PosLookupSubTable*' -->
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -25088,9 +25088,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25099,7 +25099,7 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_t>(hb_set_t*) -->
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-964'/>
             <!-- void -->
@@ -25110,7 +25110,7 @@
           <!-- int OT::RangeRecord::cmp(hb_codepoint_t) -->
           <function-decl name='cmp' mangled-name='_ZNK2OT11RangeRecord3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- int -->
@@ -25121,7 +25121,7 @@
           <!-- bool OT::RangeRecord::intersects(const hb_set_t*) -->
           <function-decl name='intersects' mangled-name='_ZNK2OT11RangeRecord10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'const hb_set_t*' -->
             <parameter type-id='type-id-1835'/>
             <!-- bool -->
@@ -25132,9 +25132,9 @@
           <!-- void OT::RangeRecord::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25271,25 +25271,25 @@
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Feature> -->
-      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1628'>
+      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
         <member-function access='public'>
           <!-- const OT::Tag& OT::RecordArrayOf<OT::Feature>::get_tag(unsigned int) -->
           <function-decl name='get_tag' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE7get_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Tag& -->
-            <return type-id='type-id-1693'/>
+            <return type-id='type-id-1699'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::RecordArrayOf<OT::Feature>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25302,14 +25302,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::LangSys> -->
-      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1631'>
+      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1637'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1682'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1688'/>
         <member-function access='public'>
           <!-- bool OT::RecordArrayOf<OT::LangSys>::find_index(unsigned int, unsigned int*) -->
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::LangSys>*' -->
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25322,7 +25322,7 @@
           <!-- unsigned int OT::RecordArrayOf<OT::LangSys>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::LangSys>*' -->
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25335,14 +25335,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::RecordArrayOf<OT::Script> -->
-      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
+      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1640'>
         <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1691'/>
         <member-function access='public'>
           <!-- bool OT::RecordArrayOf<OT::Script>::find_index(unsigned int, unsigned int*) -->
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Script>*' -->
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25355,7 +25355,7 @@
           <!-- unsigned int OT::RecordArrayOf<OT::Script>::get_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordArrayOf<OT::Script>*' -->
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25370,16 +25370,16 @@
       <!-- struct OT::RecordListOf<OT::Feature> -->
       <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1283'>
         <!-- struct OT::RecordArrayOf<OT::Feature> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1628'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
         <member-function access='public'>
           <!-- const OT::Feature& OT::RecordListOf<OT::Feature>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_7FeatureEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordListOf<OT::Feature>*' -->
-            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Feature& -->
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25397,16 +25397,16 @@
       <!-- struct OT::RecordListOf<OT::Script> -->
       <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1286'>
         <!-- struct OT::RecordArrayOf<OT::Script> -->
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1640'/>
         <member-function access='public'>
           <!-- const OT::Script& OT::RecordListOf<OT::Script>::operator[](unsigned int) -->
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_6ScriptEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RecordListOf<OT::Script>*' -->
-            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::Script& -->
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25444,9 +25444,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -25455,9 +25455,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -25466,7 +25466,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -25477,9 +25477,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25488,9 +25488,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -25510,9 +25510,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::ReverseChainSingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubst*' -->
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -25548,9 +25548,9 @@
           <!-- bool OT::ReverseChainSingleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -25559,7 +25559,7 @@
           <!-- const OT::Coverage& OT::ReverseChainSingleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='979' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -25568,9 +25568,9 @@
           <!-- void OT::ReverseChainSingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='930' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25579,9 +25579,9 @@
           <!-- void OT::ReverseChainSingleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='955' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25601,7 +25601,7 @@
           <!-- bool OT::ReverseChainSingleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ReverseChainSingleSubstFormat1*' -->
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -25635,9 +25635,9 @@
           <!-- void OT::Rule::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT4Rule7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
             <parameter type-id='type-id-1112'/>
             <!-- void -->
@@ -25648,9 +25648,9 @@
           <!-- bool OT::Rule::would_apply(OT::hb_would_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT4Rule11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1156' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
             <parameter type-id='type-id-1110'/>
             <!-- bool -->
@@ -25672,7 +25672,7 @@
           <!-- bool OT::Rule::apply(OT::hb_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT4Rule5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1163' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
@@ -25685,9 +25685,9 @@
           <!-- void OT::Rule::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT4Rule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Rule*' -->
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1114'/>
             <!-- void -->
@@ -25720,9 +25720,9 @@
           <!-- bool OT::RuleSet::would_apply(OT::hb_would_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT7RuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
             <parameter type-id='type-id-1110'/>
             <!-- bool -->
@@ -25733,9 +25733,9 @@
           <!-- void OT::RuleSet::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
           <function-decl name='closure' mangled-name='_ZNK2OT7RuleSet7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1195' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'OT::ContextClosureLookupContext&' -->
             <parameter type-id='type-id-1112'/>
             <!-- void -->
@@ -25746,9 +25746,9 @@
           <!-- void OT::RuleSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, OT::ContextCollectGlyphsLookupContext&) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7RuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'OT::ContextCollectGlyphsLookupContext&' -->
             <parameter type-id='type-id-1114'/>
             <!-- void -->
@@ -25759,7 +25759,7 @@
           <!-- bool OT::RuleSet::apply(OT::hb_apply_context_t*, OT::ContextApplyLookupContext&) -->
           <function-decl name='apply' mangled-name='_ZNK2OT7RuleSet5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::RuleSet*' -->
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'OT::ContextApplyLookupContext&' -->
@@ -25786,7 +25786,7 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GDEF* -->
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1474'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25807,7 +25807,7 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GPOS* -->
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25828,7 +25828,7 @@
             <!-- parameter of type 'hb_blob_t*' -->
             <parameter type-id='type-id-59'/>
             <!-- const OT::GSUB* -->
-            <return type-id='type-id-1472'/>
+            <return type-id='type-id-1478'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -25840,7 +25840,7 @@
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
           <!-- OT::RecordArrayOf<OT::LangSys> OT::Script::langSys -->
-          <var-decl name='langSys' type-id='type-id-1631' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
+          <var-decl name='langSys' type-id='type-id-1637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Script::min_size -->
@@ -25850,9 +25850,9 @@
           <!-- const OT::LangSys& OT::Script::get_default_lang_sys() -->
           <function-decl name='get_default_lang_sys' mangled-name='_ZNK2OT6Script20get_default_lang_sysEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -25872,7 +25872,7 @@
           <!-- unsigned int OT::Script::get_lang_sys_tags(unsigned int, unsigned int*, hb_tag_t*) -->
           <function-decl name='get_lang_sys_tags' mangled-name='_ZNK2OT6Script17get_lang_sys_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25887,18 +25887,18 @@
           <!-- const OT::LangSys& OT::Script::get_lang_sys(unsigned int) -->
           <function-decl name='get_lang_sys' mangled-name='_ZNK2OT6Script12get_lang_sysEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::LangSys& -->
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- bool OT::Script::find_lang_sys_index(hb_tag_t, unsigned int*) -->
           <function-decl name='find_lang_sys_index' mangled-name='_ZNK2OT6Script19find_lang_sys_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Script*' -->
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_tag_t' -->
             <parameter type-id='type-id-184'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -25922,9 +25922,9 @@
           <!-- void OT::Sequence::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT8Sequence7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25933,9 +25933,9 @@
           <!-- void OT::Sequence::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Sequence14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -25955,7 +25955,7 @@
           <!-- bool OT::Sequence::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT8Sequence5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::Sequence*' -->
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -25990,9 +25990,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SinglePos::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26001,7 +26001,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::SinglePos::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26012,9 +26012,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SinglePos::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SinglePos*' -->
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26068,7 +26068,7 @@
             <!-- implicit parameter of type 'const OT::SinglePosFormat1*' -->
             <parameter type-id='type-id-531' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26137,7 +26137,7 @@
             <!-- implicit parameter of type 'const OT::SinglePosFormat2*' -->
             <parameter type-id='type-id-532' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26192,9 +26192,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26203,9 +26203,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -26214,7 +26214,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::SingleSubst::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26225,9 +26225,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::SingleSubst::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26236,9 +26236,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SingleSubst::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26258,9 +26258,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SingleSubst::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubst*' -->
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -26309,9 +26309,9 @@
           <!-- bool OT::SingleSubstFormat1::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26320,7 +26320,7 @@
           <!-- const OT::Coverage& OT::SingleSubstFormat1::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -26329,9 +26329,9 @@
           <!-- void OT::SingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26340,9 +26340,9 @@
           <!-- void OT::SingleSubstFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26362,7 +26362,7 @@
           <!-- bool OT::SingleSubstFormat1::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat1*' -->
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26409,9 +26409,9 @@
           <!-- bool OT::SingleSubstFormat2::would_apply(OT::hb_would_apply_context_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26420,7 +26420,7 @@
           <!-- const OT::Coverage& OT::SingleSubstFormat2::get_coverage() -->
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- const OT::Coverage& -->
             <return type-id='type-id-943'/>
           </function-decl>
@@ -26429,9 +26429,9 @@
           <!-- void OT::SingleSubstFormat2::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26440,9 +26440,9 @@
           <!-- void OT::SingleSubstFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26462,7 +26462,7 @@
           <!-- bool OT::SingleSubstFormat2::apply(OT::hb_apply_context_t*) -->
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SingleSubstFormat2*' -->
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26488,14 +26488,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1676'>
+      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
         <!-- struct OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26506,7 +26506,7 @@
           <!-- int OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26515,14 +26515,14 @@
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1679'>
+      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
         <!-- struct OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1060'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26533,7 +26533,7 @@
           <!-- int OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::bsearch<hb_codepoint_t>(const hb_codepoint_t&) -->
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <!-- parameter of type 'const hb_codepoint_t&' -->
             <parameter type-id='type-id-813'/>
             <!-- int -->
@@ -26547,32 +26547,32 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1062'/>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1688'>
         <!-- struct OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1064'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1741'/>
             <!-- int -->
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1691'>
         <!-- struct OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> > -->
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
         <member-function access='public'>
           <!-- int OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::bsearch<hb_tag_t>(const hb_tag_t&) -->
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SortedArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >*' -->
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
             <!-- parameter of type 'const hb_tag_t&' -->
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1741'/>
             <!-- int -->
             <return type-id='type-id-11'/>
           </function-decl>
@@ -26586,9 +26586,9 @@
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26597,9 +26597,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -26608,9 +26608,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26619,9 +26619,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26630,7 +26630,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookup::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
@@ -26650,11 +26650,11 @@
           <!-- bool OT::SubstLookup::would_apply(OT::hb_would_apply_context_t*, const hb_set_digest_t*) -->
           <function-decl name='would_apply' mangled-name='_ZNK2OT11SubstLookup11would_applyEPNS_24hb_would_apply_context_tEPK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES3_IS4_ImLj0EES4_ImLj9EEEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'const hb_set_digest_t*' -->
-            <parameter type-id='type-id-1734'/>
+            <parameter type-id='type-id-1740'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26674,7 +26674,7 @@
           <!-- bool OT::SubstLookup::is_reverse() -->
           <function-decl name='is_reverse' mangled-name='_ZNK2OT11SubstLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -26683,7 +26683,7 @@
           <!-- bool OT::SubstLookup::apply_once(OT::hb_apply_context_t*) -->
           <function-decl name='apply_once' mangled-name='_ZNK2OT11SubstLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- bool -->
@@ -26694,9 +26694,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::closure(OT::hb_closure_context_t*) -->
           <function-decl name='closure' mangled-name='_ZNK2OT11SubstLookup7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1169' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26705,9 +26705,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11SubstLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -26716,18 +26716,18 @@
           <!-- const OT::SubstLookupSubTable& OT::SubstLookup::get_subtable(unsigned int) -->
           <function-decl name='get_subtable' mangled-name='_ZNK2OT11SubstLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- const OT::SubstLookupSubTable& -->
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_collect_glyphs_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -26738,7 +26738,7 @@
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookup::dispatch_recurse_func<OT::hb_closure_context_t>(unsigned int) -->
           <function-decl name='dispatch_recurse_func&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -26760,9 +26760,9 @@
           <!-- void OT::SubstLookup::add_coverage<hb_set_digest_t>(hb_set_digest_t*) -->
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookup*' -->
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <!-- parameter of type 'hb_set_digest_t*' -->
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -26883,7 +26883,7 @@
             </data-member>
             <data-member access='public'>
               <!-- OT::ExtensionSubst extension -->
-              <var-decl name='extension' type-id='type-id-1454' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-1460' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='public'>
               <!-- OT::ReverseChainSingleSubst reverseChainContextSingle -->
@@ -26903,9 +26903,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -26916,9 +26916,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_would_apply_context_t>(OT::hb_would_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_24hb_would_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
@@ -26942,9 +26942,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_collect_glyphs_context_t>(OT::hb_collect_glyphs_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -26955,9 +26955,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_closure_context_t>(OT::hb_closure_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -26968,7 +26968,7 @@
           <!-- OT::hb_apply_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_apply_context_t>(OT::hb_apply_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324'/>
             <!-- parameter of type 'unsigned int' -->
@@ -26981,9 +26981,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::SubstLookupSubTable::dispatch<OT::hb_get_coverage_context_t>(OT::hb_get_coverage_context_t*, unsigned int) -->
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::SubstLookupSubTable*' -->
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <!-- parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1342'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
@@ -27027,7 +27027,7 @@
           <!-- bool OT::ValueFormat::has_device() -->
           <function-decl name='has_device' mangled-name='_ZNK2OT11ValueFormat10has_deviceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- bool -->
             <return type-id='type-id-1'/>
           </function-decl>
@@ -27036,25 +27036,25 @@
           <!-- const OT::SHORT& OT::ValueFormat::get_short() -->
           <function-decl name='get_short' mangled-name='_ZN2OT11ValueFormat9get_shortEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- const OT::SHORT& -->
-            <return type-id='type-id-1655'/>
+            <return type-id='type-id-1661'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& OT::ValueFormat::get_device() -->
           <function-decl name='get_device' mangled-name='_ZN2OT11ValueFormat10get_deviceEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- const OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >& -->
-            <return type-id='type-id-1566'/>
+            <return type-id='type-id-1572'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- unsigned int OT::ValueFormat::get_size() -->
           <function-decl name='get_size' mangled-name='_ZNK2OT11ValueFormat8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -27110,7 +27110,7 @@
           <!-- unsigned int OT::ValueFormat::get_len() -->
           <function-decl name='get_len' mangled-name='_ZNK2OT11ValueFormat7get_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- unsigned int -->
             <return type-id='type-id-18'/>
           </function-decl>
@@ -27138,15 +27138,15 @@
           <!-- void OT::ValueFormat::apply_value(hb_font_t*, hb_direction_t, void*, const OT::Value*, hb_glyph_position_t&) -->
           <function-decl name='apply_value' mangled-name='_ZNK2OT11ValueFormat11apply_valueEP9hb_font_t14hb_direction_tPKvPKNS_7IntTypeItLj2EEER19hb_glyph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <!-- parameter of type 'enum hb_direction_t' -->
             <parameter type-id='type-id-68'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const OT::Value*' -->
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <!-- parameter of type 'hb_glyph_position_t&' -->
             <parameter type-id='type-id-98'/>
             <!-- void -->
@@ -27178,8 +27178,8 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <!-- typedef bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* OT::hb_apply_context_t::matcher_t::match_func_t -->
-              <typedef-decl name='match_func_t' type-id='type-id-1342' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
+              <!-- typedef bool(*)(hb_codepoint_t, const OT::USHORT&, void*) OT::hb_apply_context_t::matcher_t::match_func_t -->
+              <typedef-decl name='match_func_t' type-id='type-id-1346' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::matcher_t::lookup_props -->
@@ -27290,11 +27290,11 @@
               <!-- OT::hb_apply_context_t::matcher_t::may_match_t OT::hb_apply_context_t::matcher_t::may_match(const hb_glyph_info_t&, const OT::USHORT*) -->
               <function-decl name='may_match' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t9may_matchERK15hb_glyph_info_tPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
                 <parameter type-id='type-id-94'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
                 <return type-id='type-id-1886'/>
               </function-decl>
@@ -27303,9 +27303,9 @@
               <!-- OT::hb_apply_context_t::matcher_t::may_skip_t OT::hb_apply_context_t::matcher_t::may_skip(const OT::hb_apply_context_t*, const hb_glyph_info_t&) -->
               <function-decl name='may_skip' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t8may_skipEPKS0_RK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::matcher_t*' -->
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
                 <!-- parameter of type 'const OT::hb_apply_context_t*' -->
-                <parameter type-id='type-id-1702'/>
+                <parameter type-id='type-id-1708'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
                 <parameter type-id='type-id-94'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
@@ -27325,7 +27325,7 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_backward_iterator_t -->
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1327'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1329'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
@@ -27340,7 +27340,7 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_backward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_backward_iterator_t::num_items -->
@@ -27350,7 +27350,7 @@
               <!-- OT::hb_apply_context_t::skipping_backward_iterator_t::skipping_backward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1324'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27367,7 +27367,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_backward_iterator_t::has_no_chance() -->
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t28skipping_backward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='494' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1706' is-artificial='yes'/>
+                <parameter type-id='type-id-1712' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27376,13 +27376,13 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
                 <parameter type-id='type-id-1837'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-19'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27391,7 +27391,7 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::set_lookup_props(unsigned int) -->
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned int' -->
                 <parameter type-id='type-id-18'/>
                 <!-- void -->
@@ -27402,7 +27402,7 @@
               <!-- void OT::hb_apply_context_t::skipping_backward_iterator_t::reject() -->
               <function-decl name='reject' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t6rejectEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27411,7 +27411,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_backward_iterator_t::prev() -->
               <function-decl name='prev' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_backward_iterator_t*' -->
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27420,7 +27420,7 @@
         </member-type>
         <member-type access='public'>
           <!-- struct OT::hb_apply_context_t::skipping_forward_iterator_t -->
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1329'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1331'>
             <data-member access='public' layout-offset-in-bits='0'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::idx -->
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
@@ -27435,7 +27435,7 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
               <!-- const OT::USHORT* OT::hb_apply_context_t::skipping_forward_iterator_t::match_glyph_data -->
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <!-- unsigned int OT::hb_apply_context_t::skipping_forward_iterator_t::num_items -->
@@ -27449,7 +27449,7 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1324'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27466,7 +27466,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_forward_iterator_t::has_no_chance() -->
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t27skipping_forward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1708' is-artificial='yes'/>
+                <parameter type-id='type-id-1714' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27475,13 +27475,13 @@
               <!-- void OT::hb_apply_context_t::skipping_forward_iterator_t::set_match_func(OT::hb_apply_context_t::matcher_t::match_func_t, void*, const OT::USHORT*) -->
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'typedef OT::hb_apply_context_t::matcher_t::match_func_t' -->
                 <parameter type-id='type-id-1837'/>
                 <!-- parameter of type 'void*' -->
                 <parameter type-id='type-id-19'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <!-- void -->
                 <return type-id='type-id-25'/>
               </function-decl>
@@ -27490,7 +27490,7 @@
               <!-- bool OT::hb_apply_context_t::skipping_forward_iterator_t::next() -->
               <function-decl name='next' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='426' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- bool -->
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -27499,7 +27499,7 @@
               <!-- OT::hb_apply_context_t::skipping_forward_iterator_t::skipping_forward_iterator_t(OT::hb_apply_context_t*, unsigned int, unsigned int, bool) -->
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::skipping_forward_iterator_t*' -->
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <!-- parameter of type 'OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1888'/>
                 <!-- parameter of type 'unsigned int' -->
@@ -27515,8 +27515,8 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* OT::hb_apply_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1740' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
+          <!-- typedef OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) OT::hb_apply_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1328' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
@@ -27528,7 +27528,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_font_t* OT::hb_apply_context_t::font -->
-          <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
+          <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_face_t* OT::hb_apply_context_t::face -->
@@ -27536,7 +27536,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_buffer_t* OT::hb_apply_context_t::buffer -->
-          <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
+          <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_direction_t OT::hb_apply_context_t::direction -->
@@ -27564,7 +27564,7 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <!-- const OT::GDEF& OT::hb_apply_context_t::gdef -->
-          <var-decl name='gdef' type-id='type-id-1467' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1473' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <!-- bool OT::hb_apply_context_t::has_glyph_classes -->
@@ -27582,9 +27582,9 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -27595,7 +27595,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27606,7 +27606,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27617,7 +27617,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27628,7 +27628,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27639,7 +27639,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27650,7 +27650,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27661,7 +27661,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27672,7 +27672,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27683,7 +27683,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27694,7 +27694,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27705,7 +27705,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27716,7 +27716,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27727,7 +27727,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27738,7 +27738,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27749,7 +27749,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27760,7 +27760,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27771,7 +27771,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27782,7 +27782,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27793,7 +27793,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27804,7 +27804,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -27813,7 +27813,7 @@
           <!-- bool OT::hb_apply_context_t::match_properties_mark(hb_codepoint_t, unsigned int, unsigned int) -->
           <function-decl name='match_properties_mark' mangled-name='_ZNK2OT18hb_apply_context_t21match_properties_markEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27844,7 +27844,7 @@
           <!-- void OT::hb_apply_context_t::output_glyph_for_component(hb_codepoint_t, unsigned int) -->
           <function-decl name='output_glyph_for_component' mangled-name='_ZNK2OT18hb_apply_context_t26output_glyph_for_componentEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27857,7 +27857,7 @@
           <!-- void OT::hb_apply_context_t::replace_glyph_inplace(hb_codepoint_t) -->
           <function-decl name='replace_glyph_inplace' mangled-name='_ZNK2OT18hb_apply_context_t21replace_glyph_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -27868,7 +27868,7 @@
           <!-- void OT::hb_apply_context_t::replace_glyph_with_ligature(hb_codepoint_t, unsigned int) -->
           <function-decl name='replace_glyph_with_ligature' mangled-name='_ZNK2OT18hb_apply_context_t27replace_glyph_with_ligatureEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27892,7 +27892,7 @@
           <!-- bool OT::hb_apply_context_t::stop_sublookup_iteration(OT::hb_apply_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT18hb_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_apply_context_t::return_t' -->
             <parameter type-id='type-id-379'/>
             <!-- bool -->
@@ -27936,7 +27936,7 @@
           <!-- void OT::hb_apply_context_t::_set_glyph_props(hb_codepoint_t, unsigned int, bool, bool) -->
           <function-decl name='_set_glyph_props' mangled-name='_ZNK2OT18hb_apply_context_t16_set_glyph_propsEjjbb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27953,7 +27953,7 @@
           <!-- void OT::hb_apply_context_t::replace_glyph(hb_codepoint_t) -->
           <function-decl name='replace_glyph' mangled-name='_ZNK2OT18hb_apply_context_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
             <parameter type-id='type-id-72'/>
             <!-- void -->
@@ -27964,9 +27964,9 @@
           <!-- bool OT::hb_apply_context_t::check_glyph_property(const hb_glyph_info_t*, unsigned int) -->
           <function-decl name='check_glyph_property' mangled-name='_ZNK2OT18hb_apply_context_t20check_glyph_propertyEPK15hb_glyph_info_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <!-- parameter of type 'const hb_glyph_info_t*' -->
-            <parameter type-id='type-id-1716'/>
+            <parameter type-id='type-id-1722'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- bool -->
@@ -27979,7 +27979,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <!-- parameter of type 'const OT::Lookup&' -->
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1508'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -27992,9 +27992,9 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28007,9 +28007,9 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-154'/>
-            <!-- parameter of type 'hb_buffer_t*' -->
             <parameter type-id='type-id-153'/>
+            <!-- parameter of type 'hb_buffer_t*' -->
+            <parameter type-id='type-id-152'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28027,10 +28027,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_closure_context_t -->
-      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1331'>
+      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1333'>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int)* OT::hb_closure_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1742' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
+          <!-- typedef OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) OT::hb_closure_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1336' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef hb_void_t OT::hb_closure_context_t::return_t -->
@@ -28064,7 +28064,7 @@
           <!-- OT::hb_closure_context_t::hb_closure_context_t(hb_face_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -28079,9 +28079,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28090,9 +28090,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28101,9 +28101,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28112,9 +28112,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28123,9 +28123,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28134,9 +28134,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28145,9 +28145,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28156,9 +28156,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28167,9 +28167,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28178,9 +28178,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28189,9 +28189,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28200,9 +28200,9 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28211,7 +28211,7 @@
           <!-- const char* OT::hb_closure_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT20hb_closure_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28227,7 +28227,7 @@
           <!-- OT::hb_closure_context_t::return_t OT::hb_closure_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT20hb_closure_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_closure_context_t::return_t -->
@@ -28238,7 +28238,7 @@
           <!-- bool OT::hb_closure_context_t::stop_sublookup_iteration(OT::hb_closure_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT20hb_closure_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1710' is-artificial='yes'/>
+            <parameter type-id='type-id-1716' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::return_t' -->
             <parameter type-id='type-id-1819'/>
             <!-- bool -->
@@ -28249,7 +28249,7 @@
           <!-- void OT::hb_closure_context_t::set_recurse_func(OT::hb_closure_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT20hb_closure_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_closure_context_t::recurse_func_t' -->
             <parameter type-id='type-id-1891'/>
             <!-- void -->
@@ -28258,10 +28258,10 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_collect_glyphs_context_t -->
-      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1333'>
+      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1337'>
         <member-type access='public'>
-          <!-- typedef typedef OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int)* OT::hb_collect_glyphs_context_t::recurse_func_t -->
-          <typedef-decl name='recurse_func_t' type-id='type-id-1744' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
+          <!-- typedef OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) OT::hb_collect_glyphs_context_t::recurse_func_t -->
+          <typedef-decl name='recurse_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
@@ -28307,7 +28307,7 @@
           <!-- OT::hb_collect_glyphs_context_t::hb_collect_glyphs_context_t(hb_face_t*, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*, unsigned int) -->
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -28328,7 +28328,7 @@
           <!-- OT::hb_collect_glyphs_context_t::~hb_collect_glyphs_context_t(int) -->
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-11' is-artificial='yes'/>
             <!-- void -->
@@ -28339,9 +28339,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28350,9 +28350,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28361,9 +28361,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28372,9 +28372,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28383,9 +28383,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28394,9 +28394,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28405,9 +28405,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28416,9 +28416,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28427,9 +28427,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28438,9 +28438,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28449,9 +28449,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28460,9 +28460,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28471,9 +28471,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28482,9 +28482,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28493,9 +28493,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28504,9 +28504,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28515,9 +28515,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28526,9 +28526,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28537,9 +28537,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28548,9 +28548,9 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -28559,7 +28559,7 @@
           <!-- const char* OT::hb_collect_glyphs_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT27hb_collect_glyphs_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28575,7 +28575,7 @@
           <!-- OT::hb_collect_glyphs_context_t::return_t OT::hb_collect_glyphs_context_t::recurse(unsigned int) -->
           <function-decl name='recurse' mangled-name='_ZN2OT27hb_collect_glyphs_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-18'/>
             <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -28586,7 +28586,7 @@
           <!-- bool OT::hb_collect_glyphs_context_t::stop_sublookup_iteration(OT::hb_collect_glyphs_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT27hb_collect_glyphs_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <parameter type-id='type-id-1718' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::return_t' -->
             <parameter type-id='type-id-1819'/>
             <!-- bool -->
@@ -28597,7 +28597,7 @@
           <!-- void OT::hb_collect_glyphs_context_t::set_recurse_func(OT::hb_collect_glyphs_context_t::recurse_func_t) -->
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT27hb_collect_glyphs_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_collect_glyphs_context_t::recurse_func_t' -->
             <parameter type-id='type-id-1892'/>
             <!-- void -->
@@ -28606,7 +28606,7 @@
         </member-function>
       </class-decl>
       <!-- struct OT::hb_get_coverage_context_t -->
-      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1335'>
+      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1341'>
         <member-type access='public'>
           <!-- typedef const OT::Coverage& OT::hb_get_coverage_context_t::return_t -->
           <typedef-decl name='return_t' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1818'/>
@@ -28623,7 +28623,7 @@
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28632,9 +28632,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28643,9 +28643,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28654,9 +28654,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28665,9 +28665,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28676,9 +28676,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28687,9 +28687,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28698,9 +28698,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28709,9 +28709,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28720,9 +28720,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28731,9 +28731,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat1>(const OT::SinglePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat1&' -->
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28742,9 +28742,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SinglePosFormat2>(const OT::SinglePosFormat2&) -->
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SinglePosFormat2&' -->
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28753,9 +28753,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat1>(const OT::PairPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat1&' -->
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28764,9 +28764,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::PairPosFormat2>(const OT::PairPosFormat2&) -->
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::PairPosFormat2&' -->
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28775,9 +28775,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::CursivePosFormat1>(const OT::CursivePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::CursivePosFormat1&' -->
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28786,9 +28786,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkBasePosFormat1>(const OT::MarkBasePosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkBasePosFormat1&' -->
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28797,9 +28797,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkLigPosFormat1>(const OT::MarkLigPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkLigPosFormat1&' -->
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28808,9 +28808,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MarkMarkPosFormat1>(const OT::MarkMarkPosFormat1&) -->
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MarkMarkPosFormat1&' -->
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28819,9 +28819,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28830,9 +28830,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28841,9 +28841,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28852,7 +28852,7 @@
           <!-- const char* OT::hb_get_coverage_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT25hb_get_coverage_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -28868,7 +28868,7 @@
           <!-- OT::hb_get_coverage_context_t::hb_get_coverage_context_t() -->
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-25'/>
           </function-decl>
@@ -28877,9 +28877,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28888,9 +28888,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28899,9 +28899,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28910,9 +28910,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28921,9 +28921,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28932,9 +28932,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28943,9 +28943,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28954,9 +28954,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28965,9 +28965,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28976,9 +28976,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28987,9 +28987,9 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -28998,16 +28998,16 @@
           <!-- OT::hb_get_coverage_context_t::return_t OT::hb_get_coverage_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_get_coverage_context_t*' -->
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_get_coverage_context_t::return_t -->
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
       </class-decl>
       <!-- struct OT::hb_would_apply_context_t -->
-      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1337'>
+      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1343'>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
           <var-decl name='max_debug_depth' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
@@ -29036,7 +29036,7 @@
           <!-- OT::hb_would_apply_context_t::hb_would_apply_context_t(hb_face_t*, const hb_codepoint_t*, unsigned int, bool) -->
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
             <parameter type-id='type-id-160'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
@@ -29053,9 +29053,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat1>(const OT::SingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat1&' -->
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29064,9 +29064,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::SingleSubstFormat2>(const OT::SingleSubstFormat2&) -->
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::SingleSubstFormat2&' -->
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29075,9 +29075,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::MultipleSubstFormat1>(const OT::MultipleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::MultipleSubstFormat1&' -->
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29086,9 +29086,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::AlternateSubstFormat1>(const OT::AlternateSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::AlternateSubstFormat1&' -->
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29097,9 +29097,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ReverseChainSingleSubstFormat1>(const OT::ReverseChainSingleSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ReverseChainSingleSubstFormat1&' -->
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29108,9 +29108,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::LigatureSubstFormat1>(const OT::LigatureSubstFormat1&) -->
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::LigatureSubstFormat1&' -->
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29119,9 +29119,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat1>(const OT::ContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat1&' -->
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29130,9 +29130,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat2>(const OT::ContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat2&' -->
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29141,9 +29141,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ContextFormat3>(const OT::ContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ContextFormat3&' -->
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29152,9 +29152,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat1>(const OT::ChainContextFormat1&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat1&' -->
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29163,9 +29163,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat2>(const OT::ChainContextFormat2&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat2&' -->
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29174,9 +29174,9 @@
           <!-- OT::hb_would_apply_context_t::return_t OT::hb_would_apply_context_t::dispatch<OT::ChainContextFormat3>(const OT::ChainContextFormat3&) -->
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- parameter of type 'const OT::ChainContextFormat3&' -->
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <!-- typedef OT::hb_would_apply_context_t::return_t -->
             <return type-id='type-id-379'/>
           </function-decl>
@@ -29185,7 +29185,7 @@
           <!-- const char* OT::hb_would_apply_context_t::get_name() -->
           <function-decl name='get_name' mangled-name='_ZN2OT24hb_would_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <!-- const char* -->
             <return type-id='type-id-17'/>
           </function-decl>
@@ -29201,7 +29201,7 @@
           <!-- bool OT::hb_would_apply_context_t::stop_sublookup_iteration(OT::hb_would_apply_context_t::return_t) -->
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT24hb_would_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const OT::hb_would_apply_context_t*' -->
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <parameter type-id='type-id-1720' is-artificial='yes'/>
             <!-- parameter of type 'typedef OT::hb_would_apply_context_t::return_t' -->
             <parameter type-id='type-id-379'/>
             <!-- bool -->
@@ -29211,12 +29211,12 @@
       </class-decl>
       <!-- typedef OT::USHORT OT::Value -->
       <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
-      <!-- typedef OT::Value[1] OT::ValueRecord -->
+      <!-- typedef Value[1] OT::ValueRecord -->
       <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1871'/>
-      <!-- typedef void (hb_set_t*, const OT::USHORT&, void*)* OT::collect_glyphs_func_t -->
+      <!-- typedef void(*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
       <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1747' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1839'/>
-      <!-- typedef bool (hb_set_t*, const OT::USHORT&, void*)* OT::intersects_func_t -->
-      <typedef-decl name='intersects_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
+      <!-- typedef bool(*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
+      <typedef-decl name='intersects_func_t' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
       <!-- struct OT::Supplier<OT::EntryExitRecord> -->
       <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'/>
       <!-- struct OT::Supplier<OT::Index> -->
@@ -29378,7 +29378,7 @@
     <!-- unsigned int hb_ot_layout_get_ligature_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, int*) -->
     <function-decl name='hb_ot_layout_get_ligature_carets' mangled-name='hb_ot_layout_get_ligature_carets' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_ligature_carets'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
@@ -29427,7 +29427,7 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
+      <parameter type-id='type-id-1742' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
@@ -29602,11 +29602,11 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
+      <parameter type-id='type-id-1742' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
+      <parameter type-id='type-id-1742' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
-      <parameter type-id='type-id-1736' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
+      <parameter type-id='type-id-1742' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <!-- void -->
@@ -29689,7 +29689,7 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <!-- OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1739'>
+    <function-type size-in-bits='64' id='type-id-1327'>
       <!-- parameter of type 'OT::hb_apply_context_t*' -->
       <parameter type-id='type-id-1324'/>
       <!-- parameter of type 'unsigned int' -->
@@ -29698,40 +29698,40 @@
       <return type-id='type-id-379'/>
     </function-type>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1339'>
+    <function-type size-in-bits='64' id='type-id-1347'>
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- bool (hb_codepoint_t, const OT::USHORT&, void*) -->
-    <function-type size-in-bits='64' id='type-id-1341'>
+    <function-type size-in-bits='64' id='type-id-1345'>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
       <parameter type-id='type-id-72'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- bool -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- OT::hb_closure_context_t::return_t (OT::hb_closure_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1741'>
+    <function-type size-in-bits='64' id='type-id-1335'>
       <!-- parameter of type 'OT::hb_closure_context_t*' -->
-      <parameter type-id='type-id-1332'/>
+      <parameter type-id='type-id-1334'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18'/>
       <!-- typedef OT::hb_closure_context_t::return_t -->
       <return type-id='type-id-1819'/>
     </function-type>
     <!-- OT::hb_collect_glyphs_context_t::return_t (OT::hb_collect_glyphs_context_t*, unsigned int) -->
-    <function-type size-in-bits='64' id='type-id-1743'>
+    <function-type size-in-bits='64' id='type-id-1339'>
       <!-- parameter of type 'OT::hb_collect_glyphs_context_t*' -->
-      <parameter type-id='type-id-1334'/>
+      <parameter type-id='type-id-1338'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-18'/>
       <!-- typedef OT::hb_collect_glyphs_context_t::return_t -->
@@ -29742,9 +29742,9 @@
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-962'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
-      <!-- parameter of type 'hb_buffer_t*' -->
       <parameter type-id='type-id-153'/>
+      <!-- parameter of type 'hb_buffer_t*' -->
+      <parameter type-id='type-id-152'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-type>
@@ -29753,7 +29753,7 @@
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-964'/>
       <!-- parameter of type 'const OT::USHORT&' -->
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-19'/>
       <!-- void -->
@@ -30219,13 +30219,13 @@
     <!-- OT::SingleSubstFormat2& -->
     <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-561'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1682' size-in-bits='64' id='type-id-551'/>
     <!-- OT::SortedArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1682' size-in-bits='64' id='type-id-549'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1685' size-in-bits='64' id='type-id-555'/>
     <!-- OT::SortedArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >* -->
-    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-553'/>
+    <pointer-type-def type-id='type-id-1685' size-in-bits='64' id='type-id-553'/>
     <!-- OT::SubstLookup* const -->
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-1924'/>
     <!-- OT::SubstLookup* const& -->
@@ -30635,7 +30635,7 @@
           <!-- implicit parameter of type 'const indic_shape_plan_t*' -->
           <parameter type-id='type-id-1999' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
+          <parameter type-id='type-id-153'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
           <parameter type-id='type-id-119'/>
           <!-- bool -->
@@ -30768,23 +30768,23 @@
         <var-decl name='name' type-id='type-id-2013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::collect_features -->
+        <!-- void(*hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='collect_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (hb_ot_shape_planner_t*)* hb_ot_complex_shaper_t::override_features -->
+        <!-- void(*hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='override_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void* (const hb_ot_shape_plan_t*)* hb_ot_complex_shaper_t::data_create -->
+        <!-- void*(*hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
         <var-decl name='data_create' type-id='type-id-2018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (void*)* hb_ot_complex_shaper_t::data_destroy -->
+        <!-- void(*hb_ot_complex_shaper_t::data_destroy)(void*) -->
         <var-decl name='data_destroy' type-id='type-id-44' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::preprocess_text -->
+        <!-- void(*hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='preprocess_text' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -30792,15 +30792,15 @@
         <var-decl name='normalization_preference' type-id='type-id-2014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_complex_shaper_t::decompose -->
+        <!-- bool(*hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_complex_shaper_t::compose -->
+        <!-- bool(*hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* hb_ot_complex_shaper_t::setup_masks -->
+        <!-- void(*hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='setup_masks' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -30820,27 +30820,27 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_buffer_t* hb_ot_shape_normalize_context_t::buffer -->
-        <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
+        <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_font_t* hb_ot_shape_normalize_context_t::font -->
-        <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
+        <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- hb_unicode_funcs_t* hb_ot_shape_normalize_context_t::unicode -->
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::decompose -->
+        <!-- bool(*hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* hb_ot_shape_normalize_context_t::compose -->
+        <!-- bool(*hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct hb_ot_shape_plan_t -->
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
@@ -30908,9 +30908,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -30921,9 +30921,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-962' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-154'/>
-          <!-- parameter of type 'hb_buffer_t*' -->
           <parameter type-id='type-id-153'/>
+          <!-- parameter of type 'hb_buffer_t*' -->
+          <parameter type-id='type-id-152'/>
           <!-- void -->
           <return type-id='type-id-25'/>
         </function-decl>
@@ -31001,9 +31001,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*)* -->
+    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2020'/>
-    <!-- bool (const hb_ot_shape_normalize_context_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*)* -->
+    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2021'/>
     <!-- const hb_ot_complex_shaper_t -->
     <qualified-type-def type-id='type-id-2016' const='yes' id='type-id-2030'/>
@@ -31022,18 +31022,18 @@
     <!-- const hb_shape_plan_t* -->
     <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2025'/>
     <!-- hb_ot_shape_plan_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-1723' size-in-bits='64' id='type-id-2027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1729' size-in-bits='64' id='type-id-2027'/>
     <!-- hb_ot_shape_plan_t* -->
-    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-1816'/>
     <!-- hb_ot_shape_planner_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2035'/>
     <!-- hb_ot_shape_planner_t* -->
     <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
-    <!-- void (const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*)* -->
+    <!-- void(*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
     <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2019'/>
-    <!-- void (hb_ot_shape_planner_t*)* -->
+    <!-- void(*)(hb_ot_shape_planner_t*) -->
     <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2017'/>
-    <!-- void* (const hb_ot_shape_plan_t*)* -->
+    <!-- void*(*)(const hb_ot_shape_plan_t*) -->
     <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-2018'/>
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
@@ -31049,9 +31049,9 @@
     <!-- void hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, hb_set_t*) -->
     <function-decl name='hb_ot_shape_glyphs_closure' mangled-name='hb_ot_shape_glyphs_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_glyphs_closure'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31092,9 +31092,9 @@
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-962'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-152'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <!-- void -->
       <return type-id='type-id-25'/>
     </function-type>
@@ -31766,9 +31766,9 @@
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-194' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31834,9 +31834,9 @@
     <!-- hb_bool_t hb_shape_full(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -31849,9 +31849,9 @@
     <!-- void hb_shape(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <!-- parameter of type 'unsigned int' -->
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index adff58f8..f29ab0bf 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -7255,7 +7255,7 @@
     <typedef-decl name='_IO_lock_t' type-id='type-id-18' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-115'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-100' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-116'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-117' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-118'/>
     <!-- typedef int __int32_t -->
     <typedef-decl name='__int32_t' type-id='type-id-13' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-119'/>
@@ -7429,7 +7429,7 @@
     <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-44'/>
     <!-- fpos_t* -->
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-192'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-117'/>
     <!-- int& -->
     <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-40'/>
@@ -7465,7 +7465,7 @@
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-208'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-41'/>
-    <!-- void ()* -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
     <!-- vtkImageDataLIC2D* -->
     <pointer-type-def type-id='type-id-10' size-in-bits='64' id='type-id-17'/>
@@ -10627,9 +10627,9 @@
       <!-- void -->
       <return type-id='type-id-18'/>
     </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-210'/>
       <!-- int -->
       <return type-id='type-id-13'/>
@@ -12069,7 +12069,7 @@
     <qualified-type-def type-id='type-id-240' const='yes' id='type-id-293'/>
     <!-- const vtkWeakPointer<vtkImageDataLIC2D>* -->
     <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-289'/>
-    <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)* -->
+    <!-- std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&) -->
     <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
     <!-- vtkImageDataLIC2D& -->
     <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-296'/>
@@ -12400,11 +12400,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-311'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-312' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -16332,11 +16332,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-468' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -18085,11 +18085,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-558' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -19329,11 +19329,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-625'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-626' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -22597,11 +22597,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-707' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
@@ -26533,11 +26533,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-899'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-900' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-295'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-278'/>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 97490f59..67e0c80b 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -2732,13 +2732,13 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* ListAllProcessThreadsCallBack -->
+    <!-- typedef int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) ListAllProcessThreadsCallBack -->
     <typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-77' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-78'/>
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-79'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-79' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-80'/>
-    <!-- int (void*, int, pid_t*, typedef __va_list_tag __va_list_tag*)* -->
+    <!-- int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-77'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-82'/>
@@ -3869,9 +3869,9 @@
       <!-- void -->
       <return type-id='type-id-75'/>
     </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-162'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -4237,11 +4237,11 @@
         <var-decl name='kHashMultiplier' type-id='type-id-191' visibility='default' filepath='src/addressmap-inl.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <!-- void* (unsigned long int)* AddressMap<HeapProfileTable::AllocValue>::alloc_ -->
+        <!-- void*(*AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
         <var-decl name='alloc_' type-id='type-id-192' visibility='default' filepath='src/addressmap-inl.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <!-- void (void*)* AddressMap<HeapProfileTable::AllocValue>::dealloc_ -->
+        <!-- void(*AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
         <var-decl name='dealloc_' type-id='type-id-193' visibility='default' filepath='src/addressmap-inl.h' line='252' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
@@ -4249,13 +4249,13 @@
         <var-decl name='allocated_' type-id='type-id-194' visibility='default' filepath='src/addressmap-inl.h' line='253' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (unsigned long int)*, void (void*)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
         <function-decl name='AddressMap' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void (void*)*' -->
+          <!-- parameter of type 'void(*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4273,26 +4273,26 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)), void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
         <function-decl name='Iterate&lt;void (*)(const void*, const HeapProfileTable::AllocInfo&amp;)&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&))' -->
           <parameter type-id='type-id-197'/>
-          <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
+          <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
           <parameter type-id='type-id-198'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (unsigned long int)*, void (void*)*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
         <function-decl name='AddressMap' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void (void*)*' -->
+          <!-- parameter of type 'void(*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4310,11 +4310,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void (void*, HeapProfileTable::AllocValue*, char*)*, char*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void(*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
         <function-decl name='Iterate&lt;char*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, char*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, char*)' -->
           <parameter type-id='type-id-199'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-3'/>
@@ -4334,11 +4334,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)*, HeapProfileTable::AddNonLiveArgs*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::AddNonLiveArgs*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
           <parameter type-id='type-id-201'/>
           <!-- parameter of type 'HeapProfileTable::AddNonLiveArgs*' -->
           <parameter type-id='type-id-202'/>
@@ -4347,11 +4347,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)*, HeapProfileTable::Snapshot*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
           <parameter type-id='type-id-203'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot*' -->
           <parameter type-id='type-id-204'/>
@@ -4382,11 +4382,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)*, const HeapProfileTable::DumpArgs&) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
         <function-decl name='Iterate&lt;const HeapProfileTable::DumpArgs&amp;&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
           <parameter type-id='type-id-207'/>
           <!-- parameter of type 'const HeapProfileTable::DumpArgs&' -->
           <parameter type-id='type-id-208'/>
@@ -4395,11 +4395,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)*, HeapProfileTable::Snapshot::ReportState*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot::ReportState*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)*' -->
+          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
           <parameter type-id='type-id-209'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot::ReportState*' -->
           <parameter type-id='type-id-210'/>
@@ -4437,11 +4437,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(typedef size_t (const HeapProfileTable::AllocValue&)*, unsigned long int, void*, void**) -->
+        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t(*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
         <function-decl name='FindInside' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEE10FindInsideEPFmRKS1_EmPKvPS8_' filepath='src/addressmap-inl.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'typedef size_t (const HeapProfileTable::AllocValue&)*' -->
+          <!-- parameter of type 'size_t(*)(const HeapProfileTable::AllocValue&)' -->
           <parameter type-id='type-id-212'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-19'/>
@@ -4507,7 +4507,7 @@
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-215'>
       <member-type access='private'>
-        <!-- typedef void ()* GoogleInitializer::VoidFunction -->
+        <!-- typedef void(*)(void) GoogleInitializer::VoidFunction -->
         <typedef-decl name='VoidFunction' type-id='type-id-162' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-216'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -4730,7 +4730,7 @@
     <!-- class HeapCleaner -->
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-220'>
       <member-type access='private'>
-        <!-- typedef void ()* HeapCleaner::void_function -->
+        <!-- typedef void(*)(void) HeapCleaner::void_function -->
         <typedef-decl name='void_function' type-id='type-id-162' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-221'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -5734,11 +5734,11 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (const HeapProfileTable::AllocContextInfo&)* HeapProfileTable::AllocContextIterator -->
+        <!-- typedef void(*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
         <typedef-decl name='AllocContextIterator' type-id='type-id-278' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-277'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (void*, const HeapProfileTable::AllocInfo&)* HeapProfileTable::AllocIterator -->
+        <!-- typedef void(*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
         <typedef-decl name='AllocIterator' type-id='type-id-198' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-279'/>
       </member-type>
       <member-type access='private'>
@@ -5746,11 +5746,11 @@
         <typedef-decl name='AllocationMap' type-id='type-id-182' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-270'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void* (typedef size_t)* HeapProfileTable::Allocator -->
+        <!-- typedef void*(*)(size_t) HeapProfileTable::Allocator -->
         <typedef-decl name='Allocator' type-id='type-id-192' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-271'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void (void*)* HeapProfileTable::DeAllocator -->
+        <!-- typedef void(*)(void*) HeapProfileTable::DeAllocator -->
         <typedef-decl name='DeAllocator' type-id='type-id-193' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-272'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -6601,7 +6601,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::IterateBuckets<HeapProfileTable::BufferArgs*>(HeapProfileTable::BufferArgs*) -->
         <function-decl name='IterateBuckets&lt;HeapProfileTable::BufferArgs*&gt;' filepath='src/memory_region_map.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)*' -->
+          <!-- parameter of type 'void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
           <parameter type-id='type-id-314'/>
           <!-- parameter of type 'HeapProfileTable::BufferArgs*' -->
           <parameter type-id='type-id-257'/>
@@ -6612,7 +6612,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::HandleSavedRegionsLocked() -->
         <function-decl name='HandleSavedRegionsLocked' mangled-name='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE' filepath='src/memory_region_map.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE'>
-          <!-- parameter of type 'void (const MemoryRegionMap::Region&)*' -->
+          <!-- parameter of type 'void(*)(const MemoryRegionMap::Region&)' -->
           <parameter type-id='type-id-315'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -7722,13 +7722,13 @@
     <typedef-decl name='LibraryLiveObjectsStacks' type-id='type-id-379' filepath='src/heap-checker.cc' line='397' column='1' id='type-id-380'/>
     <!-- typedef std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > LiveObjectsStack -->
     <typedef-decl name='LiveObjectsStack' type-id='type-id-381' filepath='src/heap-checker.cc' line='384' column='1' id='type-id-382'/>
-    <!-- typedef void (void*)* MallocHook_DeleteHook -->
+    <!-- typedef void(*)(void*) MallocHook_DeleteHook -->
     <typedef-decl name='MallocHook_DeleteHook' type-id='type-id-193' filepath='./src/gperftools/malloc_hook_c.h' line='76' column='1' id='type-id-383'/>
-    <!-- typedef void (void*, void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_MmapHook -->
+    <!-- typedef void(*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
     <typedef-decl name='MallocHook_MmapHook' type-id='type-id-384' filepath='./src/gperftools/malloc_hook_c.h' line='99' column='1' id='type-id-385'/>
-    <!-- typedef void (void*, typedef size_t)* MallocHook_NewHook -->
+    <!-- typedef void(*)(void*, size_t) MallocHook_NewHook -->
     <typedef-decl name='MallocHook_NewHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='70' column='1' id='type-id-387'/>
-    <!-- typedef void (void*, typedef ptrdiff_t)* MallocHook_SbrkHook -->
+    <!-- typedef void(*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-388' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-389'/>
     <!-- typedef int RawFD -->
     <typedef-decl name='RawFD' type-id='type-id-1' filepath='./src/base/logging.h' line='251' column='1' id='type-id-85'/>
@@ -8305,189 +8305,189 @@
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-191'/>
     <!-- const unsigned long int* -->
     <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
+    <!-- size_t(*)(const HeapProfileTable::AllocValue&) -->
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-212'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-643'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-647'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-651'/>
     <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>* -->
-    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
+    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-653'/>
+    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-655'/>
     <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>* -->
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-657'/>
     <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
     <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>* -->
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-659'/>
     <!-- std::_Rb_tree_const_iterator<long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-659'/>
+    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
     <!-- std::_Rb_tree_const_iterator<long unsigned int>* -->
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-661'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-663'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >* -->
-    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-665'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
     <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-667'/>
     <!-- std::_Rb_tree_iterator<long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
     <!-- std::_Rb_tree_iterator<long unsigned int>* -->
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-669'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-669'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-671'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
     <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >* -->
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-673'/>
     <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
     <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-675'/>
     <!-- std::_Rb_tree_node_base* -->
-    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-676'/>
     <!-- std::_Rb_tree_node_base*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-676' size-in-bits='64' id='type-id-677'/>
     <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-677'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-678'/>
     <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
+    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
     <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >* -->
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-680'/>
+    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-681'/>
     <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
     <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-683'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-684'/>
     <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl* -->
-    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
+    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
     <!-- std::allocator<void (*)()>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-686'/>
+    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
     <!-- std::allocator<void (*)()>* -->
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-688'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-690'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider* -->
-    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-692'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
     <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-694'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-695'/>
     <!-- std::char_traits<char>::char_type& -->
-    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
     <!-- std::char_traits<char>::char_type* -->
-    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-697'/>
     <!-- std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
     <!-- std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-699'/>
     <!-- std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
     <!-- std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-701'/>
     <!-- std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
     <!-- std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-703'/>
     <!-- std::pair<const long unsigned int, HeapLeakChecker::RangeValue>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-704'/>
     <!-- std::pair<const long unsigned int, HeapLeakChecker::RangeValue>* -->
     <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-353'/>
     <!-- std::pair<const long unsigned int, long unsigned int>& -->
-    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-705'/>
     <!-- std::pair<const long unsigned int, long unsigned int>* -->
     <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-358'/>
     <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-706'/>
     <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >* -->
     <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-363'/>
     <!-- std::pair<long unsigned int, HeapLeakChecker::RangeValue>* -->
-    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-707'/>
     <!-- std::pair<long unsigned int, long unsigned int>* -->
-    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-707'/>
+    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-708'/>
     <!-- std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>* -->
-    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
     <!-- std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>* -->
-    <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
+    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>* -->
-    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>* -->
-    <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-715'/>
+    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>* -->
-    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
+    <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
     <!-- std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
     <!-- std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-720'/>
     <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
     <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-722'/>
     <!-- std::vector<void (*)(), std::allocator<void (*)()> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-723'/>
     <!-- std::vector<void (*)(), std::allocator<void (*)()> >* -->
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-222'/>
     <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >& -->
-    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-723'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
     <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >* -->
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
-    <!-- typedef size_t (const HeapProfileTable::AllocValue&)* -->
-    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-725'/>
     <!-- unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-726'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-333'/>
-    <!-- void ()* const -->
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-727'/>
-    <!-- void ()* const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-728'/>
-    <!-- void ()* const* -->
-    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-729'/>
-    <!-- void ()*& -->
-    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-730'/>
-    <!-- void ()** -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
-    <!-- void ()** const -->
-    <qualified-type-def type-id='type-id-731' const='yes' id='type-id-732'/>
-    <!-- void ()** const& -->
-    <reference-type-def kind='lvalue' type-id='type-id-732' size-in-bits='64' id='type-id-733'/>
-    <!-- void (const HeapProfileTable::AllocContextInfo&)* -->
-    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-278'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*)* -->
+    <!-- void(*)(const HeapProfileTable::AllocContextInfo&) -->
+    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-278'/>
+    <!-- void(*)(void) const -->
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-728'/>
+    <!-- void(*)(void) const& -->
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
+    <!-- void(*)(void) const* -->
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-730'/>
+    <!-- void(*)(void)& -->
+    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
+    <!-- void(*)(void)* -->
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-732'/>
+    <!-- void(*)(void)* const -->
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
+    <!-- void(*)(void)* const& -->
+    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-197'/>
-    <!-- void (void*, const HeapProfileTable::AllocInfo&)* -->
+    <!-- void(*)(void*, const HeapProfileTable::AllocInfo&) -->
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-198'/>
-    <!-- void (void*, typedef ptrdiff_t)* -->
+    <!-- void(*)(void*, ptrdiff_t) -->
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-388'/>
-    <!-- void (void*, typedef ptrdiff_t)** -->
+    <!-- void(*)(void*, ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-738'/>
-    <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+    <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-384'/>
-    <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)** -->
+    <!-- void(*)(void*, void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-740'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-369'/>
@@ -8537,7 +8537,7 @@
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-498'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-643'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-644'>
             <!-- class STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-335'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -8556,7 +8556,7 @@
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8565,7 +8565,7 @@
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -8578,7 +8578,7 @@
               <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS3_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8587,13 +8587,13 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-643' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-644' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -8602,7 +8602,7 @@
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&' -->
@@ -8615,7 +8615,7 @@
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-500'/>
             <!-- void -->
@@ -8626,7 +8626,7 @@
           <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -8664,7 +8664,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8673,7 +8673,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8682,7 +8682,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8691,7 +8691,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8700,7 +8700,7 @@
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<long unsigned int>*, std::_Rb_tree_node<long unsigned int>*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeImESB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
@@ -8715,7 +8715,7 @@
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::lower_bound(const unsigned long int&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<long unsigned int> -->
@@ -8753,7 +8753,7 @@
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8764,7 +8764,7 @@
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8775,7 +8775,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
             <return type-id='type-id-337'/>
           </function-decl>
@@ -8793,7 +8793,7 @@
           <!-- std::_Rb_tree_node<long unsigned int>* std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_create_node(const unsigned long int&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- std::_Rb_tree_node<long unsigned int>* -->
@@ -8804,7 +8804,7 @@
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<long unsigned int> -->
             <return type-id='type-id-536'/>
           </function-decl>
@@ -8813,18 +8813,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_insert_unique(const unsigned long int&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> -->
-            <return type-id='type-id-710'/>
+            <return type-id='type-id-711'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -8835,7 +8835,7 @@
           <!-- std::_Rb_tree_iterator<long unsigned int> std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const unsigned long int&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -8851,7 +8851,7 @@
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-502'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-647'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-648'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-338'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -8870,7 +8870,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8879,7 +8879,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, HeapLeakChecker::Allocator>&' -->
@@ -8892,7 +8892,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE13_Rb_tree_implIS8_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -8901,13 +8901,13 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-647' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-648' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -8916,7 +8916,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&' -->
@@ -8929,7 +8929,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-504'/>
             <!-- void -->
@@ -8940,7 +8940,7 @@
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -8951,7 +8951,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -8978,7 +8978,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -8987,7 +8987,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -8996,7 +8996,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9005,7 +9005,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9014,7 +9014,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_upper_bound(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, const unsigned long int&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
@@ -9029,7 +9029,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -9049,7 +9049,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
@@ -9073,7 +9073,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -9093,7 +9093,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
             <return type-id='type-id-341'/>
           </function-decl>
@@ -9111,7 +9111,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9122,7 +9122,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_create_nodeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >* -->
@@ -9133,7 +9133,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -9142,18 +9142,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE16_M_insert_uniqueERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9164,7 +9164,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -9175,7 +9175,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, std::_Select1st<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9191,7 +9191,7 @@
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-506'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-651'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-652'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-342'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9210,7 +9210,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9219,7 +9219,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_Rb_tree_impl(const std::less<long unsigned int>&, const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<long unsigned int>&' -->
                 <parameter type-id='type-id-595'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >, HeapLeakChecker::Allocator>&' -->
@@ -9232,7 +9232,7 @@
               <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS6_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false>*' -->
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9241,13 +9241,13 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<long unsigned int>, false> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-651' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-652' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9256,7 +9256,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -9269,7 +9269,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-508'/>
             <!-- void -->
@@ -9280,7 +9280,7 @@
           <!-- std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9291,7 +9291,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -9300,7 +9300,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -9327,7 +9327,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9336,7 +9336,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9345,7 +9345,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9354,7 +9354,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9363,7 +9363,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_upper_bound(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, const unsigned long int&) -->
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
@@ -9378,7 +9378,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -9398,7 +9398,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*, const unsigned long int&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
@@ -9422,7 +9422,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -9451,7 +9451,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9462,7 +9462,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9473,7 +9473,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
             <return type-id='type-id-345'/>
           </function-decl>
@@ -9482,7 +9482,7 @@
           <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >* -->
@@ -9493,18 +9493,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::erase(std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >) -->
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >' -->
             <parameter type-id='type-id-544'/>
             <!-- void -->
@@ -9515,7 +9515,7 @@
           <!-- void std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -9526,7 +9526,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_'>
             <!-- implicit parameter of type 'std::_Rb_tree<long unsigned int, std::pair<const long unsigned int, long unsigned int>, std::_Select1st<std::pair<const long unsigned int, long unsigned int> >, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9542,7 +9542,7 @@
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-510'>
         <member-type access='protected'>
           <!-- struct std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> -->
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-655'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-656'>
             <!-- class STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-346'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9561,7 +9561,7 @@
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_Rb_tree_impl() -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9570,7 +9570,7 @@
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_Rb_tree_impl(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
                 <parameter type-id='type-id-599'/>
                 <!-- parameter of type 'const STL_Allocator<std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, HeapLeakChecker::Allocator>&' -->
@@ -9583,7 +9583,7 @@
               <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>::_M_initialize() -->
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE13_Rb_tree_implISH_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false>*' -->
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -9592,13 +9592,13 @@
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree_impl<std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, false> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-655' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-656' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree() -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9607,7 +9607,7 @@
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-599'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&' -->
@@ -9620,7 +9620,7 @@
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_Rb_tree(const std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-512'/>
             <!-- void -->
@@ -9631,7 +9631,7 @@
           <!-- std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::~_Rb_tree(int) -->
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9642,7 +9642,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -9651,7 +9651,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -9705,7 +9705,7 @@
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_put_node(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_put_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9716,7 +9716,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9725,7 +9725,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9734,7 +9734,7 @@
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_destroy_node(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE15_M_destroy_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9745,7 +9745,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_begin() -->
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9754,7 +9754,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_get_node() -->
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9772,7 +9772,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_end() -->
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
             <return type-id='type-id-349'/>
           </function-decl>
@@ -9781,7 +9781,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_lower_bound(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*, std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*, const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_lower_boundEPSt13_Rb_tree_nodeISD_ESM_RS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
@@ -9796,7 +9796,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::lower_bound(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11lower_boundERS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
@@ -9816,7 +9816,7 @@
           <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_create_node(const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_create_nodeERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-364'/>
             <!-- std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >* -->
@@ -9836,18 +9836,18 @@
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_rightmost() -->
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <!-- std::_Rb_tree_node_base*& std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_leftmost() -->
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -9863,7 +9863,7 @@
           <!-- void std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_erase(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -9874,7 +9874,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_(const std::_Rb_tree_node_base*, const std::_Rb_tree_node_base*, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
             <parameter type-id='type-id-554'/>
             <!-- parameter of type 'const std::_Rb_tree_node_base*' -->
@@ -9889,18 +9889,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_unique(const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-364'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> -->
-            <return type-id='type-id-716'/>
+            <return type-id='type-id-717'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::_M_insert_unique_(std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_'>
             <!-- implicit parameter of type 'std::_Rb_tree<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, std::_Select1st<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >' -->
             <parameter type-id='type-id-529'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
@@ -9918,7 +9918,7 @@
           <!-- void std::allocator<void (*)()>::allocator() -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -9927,7 +9927,7 @@
           <!-- void std::allocator<void (*)()>::allocator(const std::allocator<void (*)()>&) -->
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -9938,7 +9938,7 @@
           <!-- std::allocator<void (*)()>::~allocator(int) -->
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::allocator<void (*)()>*' -->
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -9950,7 +9950,7 @@
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-576'>
         <member-type access='private'>
           <!-- struct std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider -->
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-690'>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-691'>
             <!-- class STL_Allocator<char, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-325'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -9961,7 +9961,7 @@
               <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider::_Alloc_hider(char*, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider*' -->
-                <parameter type-id='type-id-691' is-artificial='yes'/>
+                <parameter type-id='type-id-692' is-artificial='yes'/>
                 <!-- parameter of type 'char*' -->
                 <parameter type-id='type-id-3'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -9993,14 +9993,14 @@
               <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_S_empty_rep() -->
               <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-                <return type-id='type-id-692'/>
+                <return type-id='type-id-693'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_set_sharable() -->
               <function-decl name='_M_set_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep15_M_set_sharableEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -10009,7 +10009,7 @@
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_refdata() -->
               <function-decl name='_M_refdata' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -10018,7 +10018,7 @@
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_dispose(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_dispose' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_disposeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- void -->
@@ -10029,7 +10029,7 @@
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_set_length_and_sharable(unsigned long int) -->
               <function-decl name='_M_set_length_and_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep26_M_set_length_and_sharableEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'unsigned long int' -->
                 <parameter type-id='type-id-19'/>
                 <!-- void -->
@@ -10049,7 +10049,7 @@
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_refcopy() -->
               <function-decl name='_M_refcopy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refcopyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -10058,7 +10058,7 @@
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_clone(const STL_Allocator<char, HeapLeakChecker::Allocator>&, unsigned long int) -->
               <function-decl name='_M_clone' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep8_M_cloneERKS4_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- parameter of type 'unsigned long int' -->
@@ -10071,7 +10071,7 @@
               <!-- char* std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_grab(const STL_Allocator<char, HeapLeakChecker::Allocator>&, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_grab' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep7_M_grabERKS4_S8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -10084,7 +10084,7 @@
               <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep::_M_destroy(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_M_destroy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep*' -->
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- void -->
@@ -10101,7 +10101,7 @@
                 <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-327'/>
                 <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-                <return type-id='type-id-693'/>
+                <return type-id='type-id-694'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -10116,13 +10116,13 @@
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Alloc_hider std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_M_dataplus -->
-          <var-decl name='_M_dataplus' type-id='type-id-690' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string() -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10131,7 +10131,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-327'/>
             <!-- void -->
@@ -10142,7 +10142,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- void -->
@@ -10153,7 +10153,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&, unsigned long int, unsigned long int) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10168,7 +10168,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&, unsigned long int, unsigned long int, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10185,7 +10185,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const char*, unsigned long int, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-2'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -10200,7 +10200,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(const char*, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'const char*' -->
             <parameter type-id='type-id-2'/>
             <!-- parameter of type 'const STL_Allocator<char, HeapLeakChecker::Allocator>&' -->
@@ -10213,7 +10213,7 @@
           <!-- void std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::basic_string(unsigned long int, char, const STL_Allocator<char, HeapLeakChecker::Allocator>&) -->
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'char' -->
@@ -10228,7 +10228,7 @@
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::~basic_string(int) -->
           <function-decl name='~basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev'>
             <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -10293,7 +10293,7 @@
             <!-- implicit parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >*' -->
             <parameter type-id='type-id-579' is-artificial='yes'/>
             <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep* -->
-            <return type-id='type-id-693'/>
+            <return type-id='type-id-694'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10331,7 +10331,7 @@
           <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_S_empty_rep() -->
           <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >::_Rep& -->
-            <return type-id='type-id-692'/>
+            <return type-id='type-id-693'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -10402,7 +10402,7 @@
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10411,7 +10411,7 @@
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator>&' -->
@@ -10424,7 +10424,7 @@
           <!-- void std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::map(const std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-602'/>
             <!-- void -->
@@ -10435,18 +10435,18 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::insert(const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE6insertERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, HeapLeakChecker::RangeValue>&' -->
             <parameter type-id='type-id-354'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE4findERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -10457,7 +10457,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE11upper_boundERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
@@ -10468,7 +10468,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, HeapLeakChecker::RangeValue, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > -->
             <return type-id='type-id-540'/>
           </function-decl>
@@ -10488,7 +10488,7 @@
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10497,7 +10497,7 @@
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map(const std::less<long unsigned int>&, const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator>&' -->
@@ -10510,7 +10510,7 @@
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::map(const std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-605'/>
             <!-- void -->
@@ -10521,7 +10521,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::find(const unsigned long int&) -->
           <function-decl name='find' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE4findERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -10532,7 +10532,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -10541,7 +10541,7 @@
           <!-- void std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::erase(std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >) -->
           <function-decl name='erase' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS5_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >' -->
             <parameter type-id='type-id-544'/>
             <!-- void -->
@@ -10552,7 +10552,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
             <return type-id='type-id-544'/>
           </function-decl>
@@ -10561,7 +10561,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::upper_bound(const unsigned long int&) -->
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE11upper_boundERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > -->
@@ -10572,11 +10572,11 @@
           <!-- std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >::insert(const std::pair<const long unsigned int, long unsigned int>&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE6insertERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<long unsigned int, long unsigned int, std::less<long unsigned int>, STL_Allocator<std::pair<const long unsigned int, long unsigned int>, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <!-- parameter of type 'const std::pair<const long unsigned int, long unsigned int>&' -->
             <parameter type-id='type-id-359'/>
             <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10594,7 +10594,7 @@
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map() -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10603,7 +10603,7 @@
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map(const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&, const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >&' -->
             <parameter type-id='type-id-599'/>
             <!-- parameter of type 'const STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator>&' -->
@@ -10616,7 +10616,7 @@
           <!-- void std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::map(const std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-608'/>
             <!-- void -->
@@ -10627,7 +10627,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -10636,7 +10636,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
             <return type-id='type-id-548'/>
           </function-decl>
@@ -10645,7 +10645,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::lower_bound(const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE11lower_boundERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > -->
@@ -10665,7 +10665,7 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::insert(std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&) -->
           <function-decl name='insert' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE6insertESt17_Rb_tree_iteratorISF_ERKSF_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'struct std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >' -->
             <parameter type-id='type-id-548'/>
             <!-- parameter of type 'const std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >&' -->
@@ -10678,11 +10678,11 @@
           <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >::operator[](const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='operator[]' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EEixERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::map<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >, std::less<std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> > >, STL_Allocator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <!-- parameter of type 'const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-578'/>
             <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >& -->
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10696,7 +10696,7 @@
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set() -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10705,7 +10705,7 @@
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set(const std::less<long unsigned int>&, const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const std::less<long unsigned int>&' -->
             <parameter type-id='type-id-595'/>
             <!-- parameter of type 'const STL_Allocator<long unsigned int, HeapLeakChecker::Allocator>&' -->
@@ -10718,7 +10718,7 @@
           <!-- void std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::set(const std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-626'/>
             <!-- void -->
@@ -10729,7 +10729,7 @@
           <!-- std::_Rb_tree_const_iterator<long unsigned int> std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::lower_bound(const unsigned long int&) -->
           <function-decl name='lower_bound' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::_Rb_tree_const_iterator<long unsigned int> -->
@@ -10749,11 +10749,11 @@
           <!-- std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >::insert(const unsigned long int&) -->
           <function-decl name='insert' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6insertERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::set<long unsigned int, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- struct std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> -->
-            <return type-id='type-id-708'/>
+            <return type-id='type-id-709'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10765,7 +10765,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10774,7 +10774,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-321'/>
             <!-- void -->
@@ -10785,7 +10785,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(unsigned long int, const AllocObject&, const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const AllocObject&' -->
@@ -10800,7 +10800,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::vector(const std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-629'/>
             <!-- void -->
@@ -10811,7 +10811,7 @@
           <!-- std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -10822,7 +10822,7 @@
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-410'/>
           </function-decl>
@@ -10831,7 +10831,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_erase_at_end(AllocObject*) -->
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE15_M_erase_at_endEPS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1148' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'AllocObject*' -->
             <parameter type-id='type-id-322'/>
             <!-- void -->
@@ -10891,7 +10891,7 @@
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-410'/>
           </function-decl>
@@ -10900,7 +10900,7 @@
           <!-- AllocObject& std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::back() -->
           <function-decl name='back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- AllocObject& -->
             <return type-id='type-id-394'/>
           </function-decl>
@@ -10909,7 +10909,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::pop_back() -->
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10927,7 +10927,7 @@
           <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::erase(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
           <function-decl name='erase' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5eraseEN9__gnu_cxx17__normal_iteratorIPS0_S5_EE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-410'/>
             <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
@@ -10938,9 +10938,9 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::swap(std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='swap' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4swapERS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >&' -->
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-721'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10949,7 +10949,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::clear() -->
           <function-decl name='clear' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='950' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -10958,7 +10958,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_insert_aux(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, const AllocObject&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-410'/>
             <!-- parameter of type 'const AllocObject&' -->
@@ -10971,7 +10971,7 @@
           <!-- void std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::push_back(const AllocObject&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <!-- parameter of type 'const AllocObject&' -->
             <parameter type-id='type-id-324'/>
             <!-- void -->
@@ -11004,14 +11004,14 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void ()* const&, const std::allocator<void (*)()>&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void(*)(void) const&, const std::allocator<void (*)()>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -11041,14 +11041,14 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()*& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
+          <!-- void(*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPFvvESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void ()*& -->
-            <return type-id='type-id-730'/>
+            <!-- void(*)(void)& -->
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11101,25 +11101,25 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void ()* const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void(*)(void) const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void ()* const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void(*)(void) const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >' -->
             <parameter type-id='type-id-416'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11133,7 +11133,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector() -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11142,7 +11142,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-367'/>
             <!-- void -->
@@ -11153,7 +11153,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(unsigned long int, void* const&, const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void* const&' -->
@@ -11168,7 +11168,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::vector(const std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'const std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >&' -->
             <parameter type-id='type-id-637'/>
             <!-- void -->
@@ -11179,7 +11179,7 @@
           <!-- std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::~vector(int) -->
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -11221,7 +11221,7 @@
           <!-- __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::begin() -->
           <function-decl name='begin' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-419'/>
           </function-decl>
@@ -11230,7 +11230,7 @@
           <!-- __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::end() -->
           <function-decl name='end' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > > -->
             <return type-id='type-id-419'/>
           </function-decl>
@@ -11239,7 +11239,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::push_back(void* const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'void* const&' -->
             <parameter type-id='type-id-369'/>
             <!-- void -->
@@ -11250,7 +11250,7 @@
           <!-- void*& std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void*& -->
@@ -11261,7 +11261,7 @@
           <!-- void std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > >, void* const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
             <!-- implicit parameter of type 'std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void**, std::vector<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> > >' -->
             <parameter type-id='type-id-419'/>
             <!-- parameter of type 'void* const&' -->
@@ -11305,7 +11305,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11314,7 +11314,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-748'/>
             <!-- void -->
@@ -11325,7 +11325,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<MemoryRegionMap::Region>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-535'/>
             <!-- void -->
@@ -11345,9 +11345,9 @@
           <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorIN15MemoryRegionMap6RegionEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<MemoryRegionMap::Region>& -->
-            <return type-id='type-id-657'/>
+            <return type-id='type-id-658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11365,7 +11365,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11374,7 +11374,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_node<MemoryRegionMap::Region>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<MemoryRegionMap::Region>*' -->
             <parameter type-id='type-id-776'/>
             <!-- void -->
@@ -11385,7 +11385,7 @@
           <!-- void std::_Rb_tree_const_iterator<MemoryRegionMap::Region>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<MemoryRegionMap::Region>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<MemoryRegionMap::Region>*' -->
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<MemoryRegionMap::Region>&' -->
             <parameter type-id='type-id-535'/>
             <!-- void -->
@@ -11412,7 +11412,7 @@
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11421,7 +11421,7 @@
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator(const std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-752'/>
             <!-- void -->
@@ -11432,7 +11432,7 @@
           <!-- void std::_Rb_tree_const_iterator<long unsigned int>::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<long unsigned int>&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-538'/>
             <!-- void -->
@@ -11470,7 +11470,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11479,7 +11479,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-756'/>
             <!-- void -->
@@ -11490,7 +11490,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&' -->
             <parameter type-id='type-id-542'/>
             <!-- void -->
@@ -11528,7 +11528,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11537,7 +11537,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-760'/>
             <!-- void -->
@@ -11548,7 +11548,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&' -->
             <parameter type-id='type-id-546'/>
             <!-- void -->
@@ -11568,9 +11568,9 @@
           <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKmmEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-            <return type-id='type-id-663'/>
+            <return type-id='type-id-664'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11595,7 +11595,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator() -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11604,7 +11604,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator(const std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-764'/>
             <!-- void -->
@@ -11615,7 +11615,7 @@
           <!-- void std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_const_iterator(const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&) -->
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&' -->
             <parameter type-id='type-id-550'/>
             <!-- void -->
@@ -11626,18 +11626,18 @@
           <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-665'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <!-- std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-665'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11651,7 +11651,7 @@
           <!-- void std::_Rb_tree_iterator<long unsigned int>::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11660,7 +11660,7 @@
           <!-- void std::_Rb_tree_iterator<long unsigned int>::_Rb_tree_iterator(std::_Rb_tree_node<long unsigned int>*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<long unsigned int>*' -->
             <parameter type-id='type-id-337'/>
             <!-- void -->
@@ -11682,9 +11682,9 @@
           <!-- std::_Rb_tree_iterator<long unsigned int>& std::_Rb_tree_iterator<long unsigned int>::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorImEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<long unsigned int>*' -->
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<long unsigned int>& -->
-            <return type-id='type-id-667'/>
+            <return type-id='type-id-668'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11698,7 +11698,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11707,7 +11707,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
             <parameter type-id='type-id-341'/>
             <!-- void -->
@@ -11729,9 +11729,9 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmN15HeapLeakChecker10RangeValueEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >*' -->
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >& -->
-            <return type-id='type-id-669'/>
+            <return type-id='type-id-670'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11754,7 +11754,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11763,7 +11763,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const long unsigned int, long unsigned int> >*' -->
             <parameter type-id='type-id-345'/>
             <!-- void -->
@@ -11785,9 +11785,9 @@
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmmEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >*' -->
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >& -->
-            <return type-id='type-id-671'/>
+            <return type-id='type-id-672'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11821,7 +11821,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_iterator() -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -11830,7 +11830,7 @@
           <!-- void std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::_Rb_tree_iterator(std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*) -->
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- parameter of type 'std::_Rb_tree_node<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-349'/>
             <!-- void -->
@@ -11850,9 +11850,9 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator++() -->
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-673'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11881,9 +11881,9 @@
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >::operator&#45;&#45;() -->
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >& -->
-            <return type-id='type-id-673'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11892,7 +11892,7 @@
             <!-- implicit parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >*' -->
             <parameter type-id='type-id-551' is-artificial='yes'/>
             <!-- std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >& -->
-            <return type-id='type-id-705'/>
+            <return type-id='type-id-706'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11900,7 +11900,7 @@
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-552'>
         <member-type access='public'>
           <!-- typedef std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Base_ptr -->
-          <typedef-decl name='_Base_ptr' type-id='type-id-675' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-676' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
         </member-type>
         <member-type access='public'>
           <!-- typedef const std::_Rb_tree_node_base* std::_Rb_tree_node_base::_Const_Base_ptr -->
@@ -11975,7 +11975,7 @@
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-564'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-678'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-679'>
             <!-- class STL_Allocator<AllocObject, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-319'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -11994,7 +11994,7 @@
               <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12003,7 +12003,7 @@
               <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-321'/>
                 <!-- void -->
@@ -12014,13 +12014,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_impl std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-678' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-679' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12029,7 +12029,7 @@
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base(const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-321'/>
             <!-- void -->
@@ -12040,7 +12040,7 @@
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_Vector_base(unsigned long int, const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&' -->
@@ -12053,7 +12053,7 @@
           <!-- std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12064,7 +12064,7 @@
           <!-- STL_Allocator<AllocObject, HeapLeakChecker::Allocator>& std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- STL_Allocator<AllocObject, HeapLeakChecker::Allocator>& -->
             <return type-id='type-id-403'/>
           </function-decl>
@@ -12082,7 +12082,7 @@
           <!-- AllocObject* std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- AllocObject* -->
@@ -12093,7 +12093,7 @@
           <!-- void std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >::_M_deallocate(AllocObject*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <!-- parameter of type 'AllocObject*' -->
             <parameter type-id='type-id-322'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -12107,26 +12107,26 @@
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-567'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-681'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-682'>
             <!-- class std::allocator<void (*)()> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-573'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
-              <var-decl name='_M_start' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
+              <var-decl name='_M_start' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
-              <var-decl name='_M_finish' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
+              <var-decl name='_M_finish' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
-              <var-decl name='_M_end_of_storage' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
+              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
+              <var-decl name='_M_end_of_storage' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl*' -->
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12135,7 +12135,7 @@
               <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_Vector_impl(const std::allocator<void (*)()>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl*' -->
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<void (*)()>&' -->
                 <parameter type-id='type-id-575'/>
                 <!-- void -->
@@ -12146,13 +12146,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-681' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-682' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12161,7 +12161,7 @@
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base(const std::allocator<void (*)()>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
             <!-- void -->
@@ -12172,7 +12172,7 @@
           <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_base(unsigned long int, const std::allocator<void (*)()>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
@@ -12185,7 +12185,7 @@
           <!-- std::_Vector_base<void (*)(), std::allocator<void (*)()> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12202,12 +12202,12 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void ()**, unsigned long int) -->
+          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void(*)(void)*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void -->
@@ -12218,20 +12218,20 @@
           <!-- std::allocator<void (*)()>& std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- std::allocator<void (*)()>& -->
-            <return type-id='type-id-686'/>
+            <return type-id='type-id-687'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void ()** std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
+          <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12239,7 +12239,7 @@
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-570'>
         <member-type access='public'>
           <!-- struct std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl -->
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-684'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-685'>
             <!-- class STL_Allocator<void*, HeapLeakChecker::Allocator> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-365'/>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -12258,7 +12258,7 @@
               <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl() -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <!-- void -->
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -12267,7 +12267,7 @@
               <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl::_Vector_impl(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl*' -->
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
                 <parameter type-id='type-id-367'/>
                 <!-- void -->
@@ -12278,13 +12278,13 @@
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_impl std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_impl -->
-          <var-decl name='_M_impl' type-id='type-id-684' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-685' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base() -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12293,7 +12293,7 @@
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base(const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
             <parameter type-id='type-id-367'/>
             <!-- void -->
@@ -12304,7 +12304,7 @@
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_Vector_base(unsigned long int, const STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'const STL_Allocator<void*, HeapLeakChecker::Allocator>&' -->
@@ -12317,7 +12317,7 @@
           <!-- std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::~_Vector_base(int) -->
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- artificial parameter of type 'int' -->
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <!-- void -->
@@ -12337,7 +12337,7 @@
           <!-- void std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_deallocate(void**, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'void**' -->
             <parameter type-id='type-id-174'/>
             <!-- parameter of type 'unsigned long int' -->
@@ -12350,7 +12350,7 @@
           <!-- STL_Allocator<void*, HeapLeakChecker::Allocator>& std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_get_Tp_allocator() -->
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- STL_Allocator<void*, HeapLeakChecker::Allocator>& -->
             <return type-id='type-id-408'/>
           </function-decl>
@@ -12359,7 +12359,7 @@
           <!-- void** std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void*, STL_Allocator<void*, HeapLeakChecker::Allocator> >*' -->
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void** -->
@@ -12459,12 +12459,12 @@
       <!-- struct std::__miter_base<void (**)(), false> -->
       <class-decl name='__miter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-788'>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__miter_base<void (**)(), false>::__b() -->
+          <!-- void(*)(void)* std::__miter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12507,12 +12507,12 @@
       <!-- struct std::__niter_base<void (**)(), false> -->
       <class-decl name='__niter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-792'>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__niter_base<void (**)(), false>::__b() -->
+          <!-- void(*)(void)* std::__niter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12555,7 +12555,7 @@
           <!-- void std::char_traits<char>::assign(const std::char_traits<char>::char_type&) -->
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::char_traits<char>::char_type&' -->
-            <parameter type-id='type-id-695'/>
+            <parameter type-id='type-id-696'/>
             <!-- parameter of type 'const std::char_traits<char>::char_type&' -->
             <parameter type-id='type-id-588'/>
             <!-- void -->
@@ -12575,13 +12575,13 @@
           <!-- std::char_traits<char>::char_type* std::char_traits<char>::copy(const std::char_traits<char>::char_type*, size_t) -->
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::char_traits<char>::char_type*' -->
-            <parameter type-id='type-id-696'/>
+            <parameter type-id='type-id-697'/>
             <!-- parameter of type 'const std::char_traits<char>::char_type*' -->
             <parameter type-id='type-id-589'/>
             <!-- parameter of type 'typedef size_t' -->
             <parameter type-id='type-id-7'/>
             <!-- std::char_traits<char>::char_type* -->
-            <return type-id='type-id-696'/>
+            <return type-id='type-id-697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -12776,7 +12776,7 @@
           <!-- void std::pair<long unsigned int, HeapLeakChecker::RangeValue>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, HeapLeakChecker::RangeValue>*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12785,7 +12785,7 @@
           <!-- void std::pair<long unsigned int, HeapLeakChecker::RangeValue>::pair(const unsigned long int&, const HeapLeakChecker::RangeValue&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, HeapLeakChecker::RangeValue>*' -->
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- parameter of type 'const HeapLeakChecker::RangeValue&' -->
@@ -12809,7 +12809,7 @@
           <!-- void std::pair<long unsigned int, long unsigned int>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, long unsigned int>*' -->
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12818,7 +12818,7 @@
           <!-- void std::pair<long unsigned int, long unsigned int>::pair(const unsigned long int&, const unsigned long int&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<long unsigned int, long unsigned int>*' -->
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <!-- parameter of type 'const unsigned long int&' -->
             <parameter type-id='type-id-334'/>
             <!-- parameter of type 'const unsigned long int&' -->
@@ -12829,7 +12829,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-708'>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-709'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_const_iterator<long unsigned int> std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::first -->
           <var-decl name='first' type-id='type-id-517' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12842,7 +12842,7 @@
           <!-- void std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12851,7 +12851,7 @@
           <!-- void std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>::pair(const std::_Rb_tree_const_iterator<long unsigned int>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_const_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_const_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-519'/>
             <!-- parameter of type 'const bool&' -->
@@ -12862,7 +12862,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<long unsigned int>, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-710'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-711'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<long unsigned int> std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::first -->
           <var-decl name='first' type-id='type-id-536' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12875,7 +12875,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12884,7 +12884,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>::pair(const std::_Rb_tree_iterator<long unsigned int>&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<long unsigned int>, bool>*' -->
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<long unsigned int>&' -->
             <parameter type-id='type-id-538'/>
             <!-- parameter of type 'const bool&' -->
@@ -12895,7 +12895,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-712'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-713'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> > std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::first -->
           <var-decl name='first' type-id='type-id-540' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12908,7 +12908,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>*' -->
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12917,7 +12917,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >, bool>*' -->
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, HeapLeakChecker::RangeValue> >&' -->
             <parameter type-id='type-id-542'/>
             <!-- parameter of type 'const bool&' -->
@@ -12928,7 +12928,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-714'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-715'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> > std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::first -->
           <var-decl name='first' type-id='type-id-544' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12941,7 +12941,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>*' -->
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12950,7 +12950,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >, bool>*' -->
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const long unsigned int, long unsigned int> >&' -->
             <parameter type-id='type-id-546'/>
             <!-- parameter of type 'const bool&' -->
@@ -12961,7 +12961,7 @@
         </member-function>
       </class-decl>
       <!-- struct std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool> -->
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-716'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-717'>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > > std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::first -->
           <var-decl name='first' type-id='type-id-548' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
@@ -12974,7 +12974,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::pair() -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>*' -->
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -12983,7 +12983,7 @@
           <!-- void std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>::pair(const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&, const bool&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >, bool>*' -->
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <!-- parameter of type 'const std::_Rb_tree_iterator<std::pair<const std::basic_string<char, std::char_traits<char>, STL_Allocator<char, HeapLeakChecker::Allocator> >, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >&' -->
             <parameter type-id='type-id-550'/>
             <!-- parameter of type 'const bool&' -->
@@ -13189,16 +13189,16 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_a<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::__copy_move_a2<false, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
       <function-decl name='__copy_move_a2&lt;false, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13211,16 +13211,16 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_a2<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::copy<__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
       <function-decl name='copy&lt;__gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13233,16 +13233,16 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void ()** std::copy<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__copy_move_backward_a<false, AllocObject*, AllocObject*>(AllocObject*, AllocObject*, AllocObject*) -->
       <function-decl name='__copy_move_backward_a&lt;false, AllocObject*, AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13255,16 +13255,16 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_backward_a<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_backward_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_backward_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13288,16 +13288,16 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='__copy_move_backward_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a2<false, void**, void**>(void**, void**, void**) -->
       <function-decl name='__copy_move_backward_a2&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13321,16 +13321,16 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::copy_backward<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::copy_backward<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='copy_backward&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::copy_backward<void**, void**>(void**, void**, void**) -->
       <function-decl name='copy_backward&lt;void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13343,12 +13343,12 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)()>(void ()**, void ()**) -->
+      <!-- void std::_Destroy<void (**)()>(void(*)(void)*, void(*)(void)*) -->
       <function-decl name='_Destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
@@ -13374,14 +13374,14 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)(), void (*)()>(void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void std::_Destroy<void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='_Destroy&lt;void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
+        <parameter type-id='type-id-687'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
@@ -13430,16 +13430,16 @@
         <!-- struct std::pair<long unsigned int, long unsigned int> -->
         <return type-id='type-id-622'/>
       </function-decl>
-      <!-- void ()** std::uninitialized_copy<void (**)(), void (**)()>(void ()**, void ()**, void ()**) -->
+      <!-- void(*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
       <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_copy_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_copy_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13480,18 +13480,18 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void ()** std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void ()**, void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void(*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_copy_a&lt;void (**)(), void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-687'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_move_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_move_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13506,18 +13506,18 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void ()** std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void ()**, void ()**, void ()**, std::allocator<void (*)()>&) -->
+      <!-- void(*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_move_a&lt;void (**)(), void (**)(), std::allocator&lt;void (*)()&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
-        <!-- parameter of type 'void ()**' -->
-        <parameter type-id='type-id-731'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
+        <!-- parameter of type 'void(*)(void)*' -->
+        <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
-        <parameter type-id='type-id-686'/>
-        <!-- void ()** -->
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-687'/>
+        <!-- void(*)(void)* -->
+        <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__uninitialized_move_a<void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator> >(void**, void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
       <function-decl name='__uninitialized_move_a&lt;void**, void**, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13910,8 +13910,8 @@
       <!-- class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > > -->
       <class-decl name='__normal_iterator&lt;void (**)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-416'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <!-- void ()** __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
-          <var-decl name='_M_current' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
+          <!-- void(*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
+          <var-decl name='_M_current' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator() -->
@@ -13923,32 +13923,32 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void ()** const&) -->
+          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void(*)(void)* const&) -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-418' is-artificial='yes'/>
-            <!-- parameter of type 'void ()** const&' -->
-            <parameter type-id='type-id-733'/>
+            <!-- parameter of type 'void(*)(void)* const&' -->
+            <parameter type-id='type-id-734'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()** const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
+          <!-- void(*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void ()** const& -->
-            <return type-id='type-id-733'/>
+            <!-- void(*)(void)* const& -->
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()*& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
+          <!-- void(*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void ()*& -->
-            <return type-id='type-id-730'/>
+            <!-- void(*)(void)& -->
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14042,12 +14042,12 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void ()**, unsigned long int) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void(*)(void)*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
             <!-- void -->
@@ -14055,7 +14055,7 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void ()** __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
+          <!-- void(*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
@@ -14063,30 +14063,30 @@
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-73'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void ()**, void ()* const&) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void(*)(void)*, void(*)(void) const&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()* const&' -->
-            <parameter type-id='type-id-728'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void) const&' -->
+            <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void ()**) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void(*)(void)*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -14242,20 +14242,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
+            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void (void*, void*, typedef size_t, int, int, int, typedef off_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)**' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-740'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14282,33 +14282,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
-              <!-- void (void*, void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void (void*, void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14326,20 +14326,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void (void*, typedef ptrdiff_t)* base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
+            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- void (void*, typedef ptrdiff_t)* -->
+              <!-- void(*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void (void*, typedef ptrdiff_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void(*)(void*, ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)**' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)*' -->
               <parameter type-id='type-id-738'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14366,33 +14366,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef ptrdiff_t)* base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void (void*, typedef ptrdiff_t)*) -->
+            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
-              <!-- void (void*, typedef ptrdiff_t)* -->
+              <!-- void(*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void (void*, typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void (void*, typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void(*)(void*, ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14490,26 +14490,26 @@
       <return type-id='type-id-75'/>
     </function-decl>
     <!-- size_t (const HeapProfileTable::AllocValue&) -->
-    <function-type size-in-bits='64' id='type-id-725'>
+    <function-type size-in-bits='64' id='type-id-641'>
       <!-- parameter of type 'const HeapProfileTable::AllocValue&' -->
       <parameter type-id='type-id-276'/>
       <!-- typedef size_t -->
       <return type-id='type-id-7'/>
     </function-type>
     <!-- void (const HeapProfileTable::AllocContextInfo&) -->
-    <function-type size-in-bits='64' id='type-id-734'>
+    <function-type size-in-bits='64' id='type-id-727'>
       <!-- parameter of type 'const HeapProfileTable::AllocContextInfo&' -->
       <parameter type-id='type-id-442'/>
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-type>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void (void*, const HeapProfileTable::AllocInfo&)*) -->
+    <!-- void (void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <function-type size-in-bits='64' id='type-id-735'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-73'/>
       <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
       <parameter type-id='type-id-213'/>
-      <!-- parameter of type 'void (void*, const HeapProfileTable::AllocInfo&)*' -->
+      <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
       <parameter type-id='type-id-198'/>
       <!-- void -->
       <return type-id='type-id-75'/>
@@ -14583,7 +14583,7 @@
     <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
     <!-- __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <!-- bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)* -->
+    <!-- bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-127'/>
@@ -14693,17 +14693,17 @@
     <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-924'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
     <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
-    <!-- void (const HeapProfileBucket*, HeapProfileTable::BufferArgs*)* -->
+    <!-- void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-314'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
     <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-201'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-203'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
     <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-209'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, char*)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, char*) -->
     <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-199'/>
-    <!-- void (void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)* -->
+    <!-- void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
     <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-207'/>
     <!-- AddressMap<HeapProfileTable::AllocValue>::Cluster* -->
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-205'/>
@@ -14889,7 +14889,7 @@
           <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
             <return type-id='type-id-940'/>
           </function-decl>
@@ -14898,7 +14898,7 @@
           <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
             <return type-id='type-id-940'/>
           </function-decl>
@@ -15022,7 +15022,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-910' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -15031,7 +15031,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<HeapProfileTable::Bucket*, std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry>, std::_Select1st<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, std::less<HeapProfileTable::Bucket*>, std::allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> > >*' -->
             <parameter type-id='type-id-910' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -15889,7 +15889,7 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -15898,7 +15898,7 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -15991,7 +15991,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -16000,7 +16000,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -16382,7 +16382,7 @@
         <!-- const HeapProfileTable::Snapshot::Entry& -->
         <return type-id='type-id-267'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
@@ -16390,7 +16390,7 @@
         <parameter type-id='type-id-855'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket* const& -->
         <return type-id='type-id-855'/>
@@ -16406,7 +16406,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__heap_select&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1'/>
@@ -16414,7 +16414,7 @@
         <parameter type-id='type-id-280' name='__middle' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1914' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16428,13 +16428,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_linear_insert&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2079' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16448,13 +16448,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16468,13 +16468,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2154' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16488,13 +16488,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__final_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2188' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16510,7 +16510,7 @@
         <!-- HeapProfileTable::Snapshot::Entry* -->
         <return type-id='type-id-265'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16518,7 +16518,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket** -->
         <return type-id='type-id-280'/>
@@ -16534,7 +16534,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__introsort_loop&lt;HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1'/>
@@ -16542,7 +16542,7 @@
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2278' column='1'/>
         <!-- parameter of type 'long int' -->
         <parameter type-id='type-id-18' name='__depth_limit' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16565,7 +16565,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='partial_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5095' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16573,7 +16573,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16587,13 +16587,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5244' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16750,7 +16750,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__push_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16760,7 +16760,7 @@
         <parameter type-id='type-id-18'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16789,7 +16789,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__adjust_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1'/>
@@ -16799,12 +16799,12 @@
         <parameter type-id='type-id-18' name='__len' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255' name='__value' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__pop_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16812,7 +16812,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16826,13 +16826,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='make_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16846,13 +16846,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*) -->
+      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool (HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)*' -->
+        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -17278,7 +17278,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
     <!-- tcmalloc::Logger* -->
     <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <!-- void (const char*, int)* -->
+    <!-- void(*)(const char*, int) -->
     <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
@@ -17384,7 +17384,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- void (const char*, int)* tcmalloc::log_message_writer -->
+      <!-- void(*tcmalloc::log_message_writer)(const char*, int) -->
       <var-decl name='log_message_writer' type-id='type-id-1018' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
       <!-- void tcmalloc::Log(tcmalloc::LogMode, const char*, int, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem) -->
       <function-decl name='Log' mangled-name='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_' filepath='src/internal_logging.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_'>
@@ -18013,17 +18013,17 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int (void*, typedef size_t, int, int, int, typedef off_t, void**)* MallocHook_MmapReplacement -->
+    <!-- typedef int(*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
     <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-1047' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-1048'/>
-    <!-- typedef void (void*, void*, typedef size_t, typedef size_t, int, void*)* MallocHook_MremapHook -->
+    <!-- typedef void(*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
     <typedef-decl name='MallocHook_MremapHook' type-id='type-id-1049' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-1050'/>
-    <!-- typedef void (void*, typedef size_t)* MallocHook_MunmapHook -->
+    <!-- typedef void(*)(void*, size_t) MallocHook_MunmapHook -->
     <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-1051'/>
-    <!-- typedef int (void*, typedef size_t, int*)* MallocHook_MunmapReplacement -->
+    <!-- typedef int(*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
     <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-1052' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-1053'/>
-    <!-- typedef void (void*, typedef size_t, int, int, int, typedef off_t)* MallocHook_PreMmapHook -->
+    <!-- typedef void(*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
     <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1054' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1055'/>
-    <!-- typedef void (typedef ptrdiff_t)* MallocHook_PreSbrkHook -->
+    <!-- typedef void(*)(ptrdiff_t) MallocHook_PreSbrkHook -->
     <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-1056' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-1057'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
@@ -18055,25 +18055,25 @@
     <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1076'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
     <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <!-- int (void*, typedef size_t, int*)* -->
+    <!-- int(*)(void*, size_t, int*) -->
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1052'/>
-    <!-- int (void*, typedef size_t, int*)** -->
+    <!-- int(*)(void*, size_t, int*)* -->
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1079'/>
-    <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)* -->
+    <!-- int(*)(void*, size_t, int, int, int, off_t, void**) -->
     <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1047'/>
-    <!-- int (void*, typedef size_t, int, int, int, typedef off_t, void**)** -->
+    <!-- int(*)(void*, size_t, int, int, int, off_t, void**)* -->
     <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1081'/>
-    <!-- void (typedef ptrdiff_t)* -->
+    <!-- void(*)(ptrdiff_t) -->
     <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1056'/>
-    <!-- void (typedef ptrdiff_t)** -->
+    <!-- void(*)(ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1083'/>
-    <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
+    <!-- void(*)(void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1054'/>
-    <!-- void (void*, typedef size_t, int, int, int, typedef off_t)** -->
+    <!-- void(*)(void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1085'/>
-    <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
+    <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
     <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1049'/>
-    <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)** -->
+    <!-- void(*)(void*, void*, size_t, size_t, int, void*)* -->
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1087'/>
     <!-- volatile base::subtle::Atomic64* -->
     <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-108'/>
@@ -18200,11 +18200,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int (void*, typedef size_t, int*)**, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int(*)(void*, size_t, int*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1069' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)**' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)*' -->
               <parameter type-id='type-id-1079'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18222,11 +18222,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int (void*, typedef size_t, int*)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int(*)(void*, size_t, int*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18242,11 +18242,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int (void*, typedef size_t, int*)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int(*)(void*, size_t, int*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int*)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18264,11 +18264,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int (void*, typedef size_t, int, int, int, typedef off_t, void**)**, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int(*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1071' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)**' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)*' -->
               <parameter type-id='type-id-1081'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18295,22 +18295,22 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int (void*, typedef size_t, int, int, int, typedef off_t, void**)*) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int (void*, typedef size_t, int, int, int, typedef off_t, void**)*' -->
+              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18330,11 +18330,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void (void*, void*, typedef size_t, typedef size_t, int, void*)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void(*)(void*, void*, size_t, size_t, int, void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1073' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)**' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)*' -->
               <parameter type-id='type-id-1087'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18361,33 +18361,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- void(*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
-              <!-- void (void*, void*, typedef size_t, typedef size_t, int, void*)* -->
+              <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
               <return type-id='type-id-1049'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void (void*, void*, typedef size_t, typedef size_t, int, void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void(*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, void*, typedef size_t, typedef size_t, int, void*)*' -->
+              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18407,11 +18407,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void (void*, typedef size_t, int, int, int, typedef off_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1075' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)**' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-1085'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18438,33 +18438,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- void(*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
-              <!-- void (void*, typedef size_t, int, int, int, typedef off_t)* -->
+              <!-- void(*)(void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-1054'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (void*, typedef size_t, int, int, int, typedef off_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t, int, int, int, typedef off_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18482,11 +18482,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void (typedef ptrdiff_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void(*)(ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1077' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)**' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)*' -->
               <parameter type-id='type-id-1083'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18513,33 +18513,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (typedef ptrdiff_t)* base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void (typedef ptrdiff_t)*) -->
+            <!-- void(*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void(*)(ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
-              <!-- void (typedef ptrdiff_t)* -->
+              <!-- void(*)(ptrdiff_t) -->
               <return type-id='type-id-1056'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void (typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void(*)(ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void (typedef ptrdiff_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void(*)(ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void (typedef ptrdiff_t)*' -->
+              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18916,11 +18916,11 @@
     <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
-    <!-- int perftools_pthread_key_create(pthread_key_t*, void (void*)*) -->
+    <!-- int perftools_pthread_key_create(pthread_key_t*, void(*)(void*)) -->
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
       <!-- parameter of type 'pthread_key_t*' -->
       <parameter type-id='type-id-1099' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void(*)(void*)' -->
       <parameter type-id='type-id-193' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -18948,11 +18948,11 @@
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- int perftools_pthread_once(pthread_once_t*, void ()*) -->
+    <!-- int perftools_pthread_once(pthread_once_t*, void(*)(void)) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
       <parameter type-id='type-id-1101' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
-      <!-- parameter of type 'void ()*' -->
+      <!-- parameter of type 'void(*)(void)' -->
       <parameter type-id='type-id-162' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -19320,7 +19320,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-1144'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1145'/>
-    <!-- void (const MemoryRegionMap::Region&)* -->
+    <!-- void(*)(const MemoryRegionMap::Region&) -->
     <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-315'/>
     <!-- const std::_Rb_tree_node<MemoryRegionMap::Region> -->
     <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1148'/>
@@ -19478,7 +19478,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-821'/>
           </function-decl>
@@ -19487,7 +19487,7 @@
           <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* std::_Rb_tree<MemoryRegionMap::Region, MemoryRegionMap::Region, std::_Identity<MemoryRegionMap::Region>, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<MemoryRegionMap::Region>* -->
             <return type-id='type-id-821'/>
           </function-decl>
@@ -20487,7 +20487,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (int, siginfo_t*, void*, void*)* ProfileHandlerCallback -->
+    <!-- typedef void(*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
     <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1186' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1179'/>
     <!-- typedef int pthread_once_t -->
     <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1100'/>
@@ -20575,7 +20575,7 @@
     <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1230'/>
     <!-- timer_id_holder* -->
     <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1185'/>
-    <!-- void (int, siginfo_t*, void*, void*)* -->
+    <!-- void(*)(int, siginfo_t*, void*, void*) -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1186'/>
     <!-- const std::_List_node<ProfileHandlerToken*> -->
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
@@ -21259,7 +21259,7 @@
         <var-decl name='collector_' type-id='type-id-1251' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <!-- int (void*)* CpuProfiler::filter_ -->
+        <!-- int(*CpuProfiler::filter_)(void*) -->
         <var-decl name='filter_' type-id='type-id-1252' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
@@ -21691,7 +21691,7 @@
     <!-- struct ProfilerOptions -->
     <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1272'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int (void*)* ProfilerOptions::filter_in_thread -->
+        <!-- int(*ProfilerOptions::filter_in_thread)(void*) -->
         <var-decl name='filter_in_thread' type-id='type-id-1252' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -21923,7 +21923,7 @@
     <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1291'/>
     <!-- const ProfilerOptions* -->
     <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1255'/>
-    <!-- int (void*)* -->
+    <!-- int(*)(void*) -->
     <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1252'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1177'/>
@@ -22977,7 +22977,7 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_left() -->
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -22986,7 +22986,7 @@
           <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >::_S_right() -->
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'std::_Rb_tree_node_base*' -->
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <!-- std::_Rb_tree_node<std::pair<const void* const, const char*> >* -->
             <return type-id='type-id-972'/>
           </function-decl>
@@ -23079,7 +23079,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
@@ -23088,7 +23088,7 @@
             <!-- implicit parameter of type 'std::_Rb_tree<const void*, std::pair<const void* const, const char*>, std::_Select1st<std::pair<const void* const, const char*> >, std::less<const void*>, std::allocator<std::pair<const void* const, const char*> > >*' -->
             <parameter type-id='type-id-965' is-artificial='yes'/>
             <!-- std::_Rb_tree_node_base*& -->
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -26215,15 +26215,15 @@
         <var-decl name='root_' type-id='type-id-1429' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void* (unsigned long int)* TCMalloc_PageMap3<35>::allocator_ -->
+        <!-- void*(*TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
         <var-decl name='allocator_' type-id='type-id-192' visibility='default' filepath='src/pagemap.h' line='230' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26241,22 +26241,22 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (unsigned long int)*) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void* (unsigned long int)*' -->
+          <!-- parameter of type 'void*(*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26857,7 +26857,7 @@
     <typedef-decl name='_IO_lock_t' type-id='type-id-75' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1458'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-149' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1459'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int(*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-1460' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-163'/>
     <!-- typedef long int __off64_t -->
     <typedef-decl name='__off64_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-156'/>
@@ -27141,7 +27141,7 @@
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-6'/>
     <!-- const wchar_t** -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-14'/>
-    <!-- int (void*, void*)* -->
+    <!-- int(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1460'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1023'/>
@@ -27213,25 +27213,25 @@
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-23'/>
     <!-- uint64_t* -->
     <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1578'/>
-    <!-- void ()* -->
+    <!-- void(*)(void) -->
     <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-162'/>
-    <!-- void (void*)* -->
+    <!-- void(*)(void*) -->
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-193'/>
-    <!-- void (void*)** -->
+    <!-- void(*)(void*)* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-1580'/>
-    <!-- void (void*, typedef size_t)* -->
+    <!-- void(*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-386'/>
-    <!-- void (void*, typedef size_t)** -->
+    <!-- void(*)(void*, size_t)* -->
     <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1582'/>
-    <!-- void (void*, void*)* -->
+    <!-- void(*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <!-- void* (typedef size_t, typedef size_t, void*)* -->
+    <!-- void*(*)(size_t, size_t, void*) -->
     <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <!-- void* (typedef size_t, void*)* -->
+    <!-- void*(*)(size_t, void*) -->
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <!-- void* (unsigned long int)* -->
+    <!-- void*(*)(unsigned long int) -->
     <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-192'/>
-    <!-- void* (void*, typedef size_t, void*)* -->
+    <!-- void*(*)(void*, size_t, void*) -->
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-174'/>
@@ -27631,12 +27631,12 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void ()**) -->
+          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void(*)(void)*) -->
           <function-decl name='__destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
@@ -27865,16 +27865,16 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void ()* const*, void ()**) -->
+          <!-- void(*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
           <function-decl name='__copy_m&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -27933,16 +27933,16 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void ()* const*, void ()**) -->
+          <!-- void(*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
           <function-decl name='__copy_move_b&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()* const*' -->
-            <parameter type-id='type-id-729'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void) const*' -->
+            <parameter type-id='type-id-730'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -28012,16 +28012,16 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void ()** std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void ()**, void ()**) -->
+          <!-- void(*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*) -->
           <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- parameter of type 'void ()**' -->
-            <parameter type-id='type-id-731'/>
-            <!-- void ()** -->
-            <return type-id='type-id-731'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- parameter of type 'void(*)(void)*' -->
+            <parameter type-id='type-id-732'/>
+            <!-- void(*)(void)* -->
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -28148,7 +28148,7 @@
               <!-- char* std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_M_refdata() -->
               <function-decl name='_M_refdata' mangled-name='_ZNSs4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep*' -->
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <!-- char* -->
                 <return type-id='type-id-3'/>
               </function-decl>
@@ -28157,7 +28157,7 @@
               <!-- void std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep::_M_dispose(const std::allocator<char>&) -->
               <function-decl name='_M_dispose' mangled-name='_ZNSs4_Rep10_M_disposeERKSaIcE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <!-- implicit parameter of type 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep*' -->
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <!-- parameter of type 'const std::allocator<char>&' -->
                 <parameter type-id='type-id-837'/>
                 <!-- void -->
@@ -28436,7 +28436,7 @@
             <!-- implicit parameter of type 'const std::basic_string<char, std::char_traits<char>, std::allocator<char> >*' -->
             <parameter type-id='type-id-1512' is-artificial='yes'/>
             <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >::_Rep* -->
-            <return type-id='type-id-694'/>
+            <return type-id='type-id-695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -29414,20 +29414,20 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*)* base::internal::HookList<void (*)(const void*)>::GetSingular() -->
+            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- void (void*)* -->
+              <!-- void(*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void (void*)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void(*)(void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)**' -->
+              <!-- parameter of type 'void(*)(void*)*' -->
               <parameter type-id='type-id-1580'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29445,33 +29445,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*)* base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void (void*)*) -->
+            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void(*)(void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
-              <!-- void (void*)* -->
+              <!-- void(*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void (void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void(*)(void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void (void*)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void(*)(void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*)*' -->
+              <!-- parameter of type 'void(*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -29498,11 +29498,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
+            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- void (void*, typedef size_t)* -->
+              <!-- void(*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
@@ -29516,11 +29516,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (void*, typedef size_t)**, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void(*)(void*, size_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)**' -->
+              <!-- parameter of type 'void(*)(void*, size_t)*' -->
               <parameter type-id='type-id-1582'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29529,33 +29529,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void (void*, typedef size_t)* base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void (void*, typedef size_t)*) -->
+            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void(*)(void*, size_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
-              <!-- void (void*, typedef size_t)* -->
+              <!-- void(*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void (void*, typedef size_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void(*)(void*, size_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void (void*, typedef size_t)*) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void(*)(void*, size_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void (void*, typedef size_t)*' -->
+              <!-- parameter of type 'void(*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -33076,13 +33076,13 @@
         <return type-id='type-id-73'/>
       </function-decl>
     </namespace-decl>
-    <!-- void* (typedef size_t, void*)* __malloc_hook -->
+    <!-- void*(*__malloc_hook)(size_t, void*) -->
     <var-decl name='__malloc_hook' type-id='type-id-1588' mangled-name='__malloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='135' column='1' elf-symbol-id='__malloc_hook'/>
-    <!-- void* (void*, typedef size_t, void*)* __realloc_hook -->
+    <!-- void*(*__realloc_hook)(void*, size_t, void*) -->
     <var-decl name='__realloc_hook' type-id='type-id-1590' mangled-name='__realloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='137' column='1' elf-symbol-id='__realloc_hook'/>
-    <!-- void (void*, void*)* __free_hook -->
+    <!-- void(*__free_hook)(void*, void*) -->
     <var-decl name='__free_hook' type-id='type-id-1584' mangled-name='__free_hook' visibility='default' filepath='src/libc_override_glibc.h' line='139' column='1' elf-symbol-id='__free_hook'/>
-    <!-- void* (typedef size_t, typedef size_t, void*)* __memalign_hook -->
+    <!-- void*(*__memalign_hook)(size_t, size_t, void*) -->
     <var-decl name='__memalign_hook' type-id='type-id-1586' mangled-name='__memalign_hook' visibility='default' filepath='src/libc_override_glibc.h' line='141' column='1' elf-symbol-id='__memalign_hook'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index 3de32474..a6759aa3 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -4000,7 +4000,7 @@
     <typedef-decl name='_IO_lock_t' type-id='type-id-13' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-153'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-137' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-154'/>
-    <!-- typedef int (void*, void*)* __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-155' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-156'/>
     <!-- typedef int __int32_t -->
     <typedef-decl name='__int32_t' type-id='type-id-19' filepath='/usr/include/bits/types.h' line='41' column='1' id='type-id-157'/>
@@ -4334,7 +4334,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-105' size-in-bits='64' id='type-id-94'/>
     <!-- fpos_t* -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-309'/>
-    <!-- int (void*, void*)* -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-155'/>
     <!-- int& -->
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-93'/>
@@ -4396,7 +4396,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-339'/>
     <!-- std::allocator<unsigned char>* -->
     <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-340'/>
-    <!-- std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)* -->
+    <!-- std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&) -->
     <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
     <!-- std::basic_string<char, std::char_traits<char>, std::allocator<char> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-343'/>
@@ -4442,7 +4442,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-98'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-358'/>
-    <!-- void ()* -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
     <!-- vtkBoundingBox& -->
     <reference-type-def kind='lvalue' type-id='type-id-10' size-in-bits='64' id='type-id-361'/>
@@ -7802,11 +7802,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-450'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-451' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -8923,9 +8923,9 @@
       <!-- void -->
       <return type-id='type-id-13'/>
     </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-360'/>
       <!-- int -->
       <return type-id='type-id-19'/>
@@ -10519,7 +10519,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (void*, void*, int, int)* vtkRMIFunctionType -->
+    <!-- typedef void (*)(void*, void*, int, int) vtkRMIFunctionType -->
     <typedef-decl name='vtkRMIFunctionType' type-id='type-id-494' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='58' column='1' id='type-id-495'/>
     <!-- char*** -->
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-493'/>
@@ -10529,7 +10529,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-490'/>
     <!-- const vtkDummyController* -->
     <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-491'/>
-    <!-- void (void*, void*, int, int)* -->
+    <!-- void (*)(void*, void*, int, int) -->
     <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-494'/>
     <!-- vtkDummyController* -->
     <pointer-type-def type-id='type-id-487' size-in-bits='64' id='type-id-489'/>
@@ -10649,11 +10649,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-512' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -11722,11 +11722,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-563'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-564' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -12707,7 +12707,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void (vtkMultiProcessController*, void*)* vtkProcessFunctionType -->
+    <!-- typedef void (*)(vtkMultiProcessController*, void*) vtkProcessFunctionType -->
     <typedef-decl name='vtkProcessFunctionType' type-id='type-id-585' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/Parallel/Core/vtkMultiProcessController.h' line='53' column='1' id='type-id-523'/>
     <!-- __gnu_cxx::__normal_iterator<const vtkMultiProcessController::vtkInternal::vtkRMICallback*, std::vector<vtkMultiProcessController::vtkInternal::vtkRMICallback, std::allocator<vtkMultiProcessController::vtkInternal::vtkRMICallback> > >& -->
     <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-586'/>
@@ -13325,13 +13325,13 @@
     <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-958'/>
     <!-- unsigned long int& -->
     <reference-type-def kind='lvalue' type-id='type-id-4' size-in-bits='64' id='type-id-959'/>
-    <!-- void (vtkMultiProcessController*, void*)* -->
+    <!-- void (*)(vtkMultiProcessController*, void*) -->
     <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-585'/>
-    <!-- void (vtkMultiProcessController*, void*)* const -->
+    <!-- void (*)(vtkMultiProcessController*, void*) const -->
     <qualified-type-def type-id='type-id-585' const='yes' id='type-id-961'/>
-    <!-- void (vtkMultiProcessController*, void*)* const& -->
+    <!-- void (*)(vtkMultiProcessController*, void*) const& -->
     <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
-    <!-- void (vtkMultiProcessController*, void*)*& -->
+    <!-- void (*)(vtkMultiProcessController*, void*)& -->
     <reference-type-def kind='lvalue' type-id='type-id-585' size-in-bits='64' id='type-id-963'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
@@ -17704,7 +17704,7 @@
           <var-decl name='first' type-id='type-id-200' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <!-- void (vtkMultiProcessController*, void*)* std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::second -->
+          <!-- void (* std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::second)(vtkMultiProcessController*, void*) -->
           <var-decl name='second' type-id='type-id-585' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='73' column='1'/>
         </data-member>
         <member-function access='public'>
@@ -17717,13 +17717,13 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::pair(const int&, void (vtkMultiProcessController*, void*)* const&) -->
+          <!-- void std::pair<const int, void (*)(vtkMultiProcessController*, void*)>::pair(const int&, void (*)(vtkMultiProcessController*, void*) const&) -->
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::pair<const int, void (*)(vtkMultiProcessController*, void*)>*' -->
             <parameter type-id='type-id-940' is-artificial='yes'/>
             <!-- parameter of type 'const int&' -->
             <parameter type-id='type-id-431'/>
-            <!-- parameter of type 'void (vtkMultiProcessController*, void*)* const&' -->
+            <!-- parameter of type 'void (*)(vtkMultiProcessController*, void*) const&' -->
             <parameter type-id='type-id-962'/>
             <!-- void -->
             <return type-id='type-id-13'/>
@@ -17855,11 +17855,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1103'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1104' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -19305,13 +19305,13 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void (vtkMultiProcessController*, void*)*& vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >::operator[](const int&) -->
+          <!-- void (*)(vtkMultiProcessController*, void*)& vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >::operator[](const int&) -->
           <function-decl name='operator[]' mangled-name='_ZN6vtksys8hash_mapIiPFvP25vtkMultiProcessControllerPvENS_4hashIiEESt8equal_toIiESaIcEEixERKi' filepath='/tmp/legendre/spack-stage/spack-stage-R_crTC/VTK-6.1.0/spack-build/Utilities/KWSys/vtksys/hash_map.hxx' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'vtksys::hash_map<int, void (*)(vtkMultiProcessController*, void*), vtksys::hash<int>, std::equal_to<int>, std::allocator<char> >*' -->
             <parameter type-id='type-id-982' is-artificial='yes'/>
             <!-- parameter of type 'const int&' -->
             <parameter type-id='type-id-431'/>
-            <!-- void (vtkMultiProcessController*, void*)*& -->
+            <!-- void (*)(vtkMultiProcessController*, void*)& -->
             <return type-id='type-id-963'/>
           </function-decl>
         </member-function>
@@ -21731,7 +21731,7 @@
       <!-- class std::_Deque_base<unsigned char, std::allocator<unsigned char> > -->
       <class-decl name='_Deque_base&lt;unsigned char, std::allocator&lt;unsigned char&gt; &gt;' size-in-bits='640' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='362' column='1' id='type-id-1155'>
         <member-type access='protected'>
-          <!-- enum {_S_initial_map_size = 8,} -->
+          <!-- enum {_S_initial_map_size=8, } -->
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_deque.h' line='465' column='1' id='type-id-1184'>
             <underlying-type type-id='type-id-28'/>
             <enumerator name='_S_initial_map_size' value='8'/>
@@ -24016,11 +24016,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1221'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1222' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -24416,11 +24416,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1237' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -28072,11 +28072,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1480' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -29701,11 +29701,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1519' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
@@ -30462,11 +30462,11 @@
       <!-- struct std::basic_ostream<char, std::char_traits<char> > -->
       <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1540'>
         <member-function access='public'>
-          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*) -->
+          <!-- std::basic_ostream<char, std::char_traits<char> >& std::basic_ostream<char, std::char_traits<char> >::operator<<(std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)) -->
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEPFRSoS_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ostream' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::basic_ostream<char, std::char_traits<char> >*' -->
             <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (std::basic_ostream<char, std::char_traits<char> >&)*' -->
+            <!-- parameter of type 'std::basic_ostream<char, std::char_traits<char> >& (*)(std::basic_ostream<char, std::char_traits<char> >&)' -->
             <parameter type-id='type-id-342'/>
             <!-- std::basic_ostream<char, std::char_traits<char> >& -->
             <return type-id='type-id-452'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 5e94e912..3f28dbde 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1282,11 +1282,11 @@
         <var-decl name='end_diagnostic' type-id='type-id-54' visibility='default' filepath='../.././gcc/diagnostic.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- void (diagnostic_context*, const char*, va_list*)* diagnostic_context::internal_error -->
+        <!-- void (* diagnostic_context::internal_error)(diagnostic_context*, const char*, va_list*) -->
         <var-decl name='internal_error' type-id='type-id-55' visibility='default' filepath='../.././gcc/diagnostic.h' line='147' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <!-- int (int, void*)* diagnostic_context::option_enabled -->
+        <!-- int (* diagnostic_context::option_enabled)(int, void*) -->
         <var-decl name='option_enabled' type-id='type-id-56' visibility='default' filepath='../.././gcc/diagnostic.h' line='151' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
@@ -1294,7 +1294,7 @@
         <var-decl name='option_state' type-id='type-id-39' visibility='default' filepath='../.././gcc/diagnostic.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <!-- char* (diagnostic_context*, int, typedef diagnostic_t, typedef diagnostic_t)* diagnostic_context::option_name -->
+        <!-- char* (* diagnostic_context::option_name)(diagnostic_context*, int, diagnostic_t, diagnostic_t) -->
         <var-decl name='option_name' type-id='type-id-57' visibility='default' filepath='../.././gcc/diagnostic.h' line='163' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
@@ -1442,11 +1442,11 @@
         <var-decl name='alignment_mask' type-id='type-id-2' visibility='default' filepath='../.././gcc/../include/obstack.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- _obstack_chunk* (void*, long int)* obstack::chunkfun -->
+        <!-- _obstack_chunk* (* obstack::chunkfun)(void*, long int) -->
         <var-decl name='chunkfun' type-id='type-id-71' visibility='default' filepath='../.././gcc/../include/obstack.h' line='176' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- void (void*, _obstack_chunk*)* obstack::freefun -->
+        <!-- void (* obstack::freefun)(void*, _obstack_chunk*) -->
         <var-decl name='freefun' type-id='type-id-72' visibility='default' filepath='../.././gcc/../include/obstack.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
@@ -1691,7 +1691,7 @@
     <typedef-decl name='__off64_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-38'/>
     <!-- typedef long int __off_t -->
     <typedef-decl name='__off_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='141' column='1' id='type-id-35'/>
-    <!-- typedef void (int)* __sighandler_t -->
+    <!-- typedef void (*)(int) __sighandler_t -->
     <typedef-decl name='__sighandler_t' type-id='type-id-104' filepath='/usr/include/signal.h' line='84' column='1' id='type-id-105'/>
     <!-- typedef long int __time_t -->
     <typedef-decl name='__time_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='149' column='1' id='type-id-96'/>
@@ -1712,7 +1712,7 @@
     <typedef-decl name='diagnostic_info' type-id='type-id-59' filepath='../.././gcc/diagnostic.h' line='42' column='1' id='type-id-108'/>
     <!-- typedef diagnostic_prefixing_rule_t diagnostic_prefixing_rule_t -->
     <typedef-decl name='diagnostic_prefixing_rule_t' type-id='type-id-19' filepath='../.././gcc/pretty-print.h' line='52' column='1' id='type-id-18'/>
-    <!-- typedef void (diagnostic_context*, diagnostic_info*)* diagnostic_starter_fn -->
+    <!-- typedef void (*)(diagnostic_context*, diagnostic_info*) diagnostic_starter_fn -->
     <typedef-decl name='diagnostic_starter_fn' type-id='type-id-109' filepath='../.././gcc/diagnostic.h' line='55' column='1' id='type-id-53'/>
     <!-- typedef diagnostic_t diagnostic_t -->
     <typedef-decl name='diagnostic_t' type-id='type-id-22' filepath='../.././gcc/diagnostic-core.h' line='40' column='1' id='type-id-21'/>
@@ -1728,7 +1728,7 @@
     <typedef-decl name='pp_wrapping_mode_t' type-id='type-id-78' filepath='../.././gcc/pretty-print.h' line='120' column='1' id='type-id-77'/>
     <!-- typedef pretty_print_info pretty_printer -->
     <typedef-decl name='pretty_printer' type-id='type-id-79' filepath='../.././gcc/pretty-print.h' line='135' column='1' id='type-id-110'/>
-    <!-- typedef bool (pretty_printer*, text_info*, const char*, int, bool, bool, bool)* printer_fn -->
+    <!-- typedef bool (*)(pretty_printer*, text_info*, const char*, int, bool, bool, bool) printer_fn -->
     <typedef-decl name='printer_fn' type-id='type-id-111' filepath='../.././gcc/pretty-print.h' line='136' column='1' id='type-id-81'/>
     <!-- typedef unsigned long int size_t -->
     <typedef-decl name='size_t' type-id='type-id-101' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/prev-gcc/include/stddef.h' line='213' column='1' id='type-id-4'/>
@@ -1756,13 +1756,13 @@
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-33'/>
     <!-- _obstack_chunk* -->
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-42'/>
-    <!-- _obstack_chunk* (void*, long int)* -->
+    <!-- _obstack_chunk* (*)(void*, long int) -->
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-71'/>
-    <!-- bool (pretty_printer*, text_info*, const char*, int, bool, bool, bool)* -->
+    <!-- bool (*)(pretty_printer*, text_info*, const char*, int, bool, bool, bool) -->
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-111'/>
     <!-- char* -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-3'/>
-    <!-- char* (diagnostic_context*, int, typedef diagnostic_t, typedef diagnostic_t)* -->
+    <!-- char* (*)(diagnostic_context*, int, diagnostic_t, diagnostic_t) -->
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-57'/>
     <!-- char* const -->
     <qualified-type-def type-id='type-id-3' const='yes' id='type-id-116'/>
@@ -1794,7 +1794,7 @@
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-125'/>
     <!-- diagnostic_t* -->
     <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-49'/>
-    <!-- int (int, void*)* -->
+    <!-- int (*)(int, void*) -->
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-56'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-51'/>
@@ -1818,19 +1818,19 @@
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-131'/>
     <!-- va_list* -->
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-93'/>
-    <!-- void ()* -->
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
-    <!-- void (diagnostic_context*, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-55'/>
-    <!-- void (diagnostic_context*, diagnostic_info*)* -->
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
-    <!-- void (int)* -->
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-104'/>
-    <!-- void (void*)* -->
+    <!-- void (*)(diagnostic_context*, const char*, va_list*) -->
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-55'/>
+    <!-- void (*)(diagnostic_context*, diagnostic_info*) -->
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-109'/>
+    <!-- void (*)(int) -->
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-104'/>
+    <!-- void (*)(void) -->
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-138'/>
-    <!-- void (void*, _obstack_chunk*)* -->
+    <!-- void (*)(void*, _obstack_chunk*) -->
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-72'/>
-    <!-- void* (long int)* -->
+    <!-- void* (*)(long int) -->
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-95'/>
@@ -2114,7 +2114,7 @@
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-decl>
-    <!-- int _obstack_begin(obstack*, int, int, void* (long int)*, void (void*)*) -->
+    <!-- int _obstack_begin(obstack*, int, int, void* (*)(long int), void (*)(void*)) -->
     <function-decl name='_obstack_begin' filepath='../.././gcc/../include/obstack.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'obstack*' -->
       <parameter type-id='type-id-75'/>
@@ -2122,9 +2122,9 @@
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
-      <!-- parameter of type 'void* (long int)*' -->
+      <!-- parameter of type 'void* (*)(long int)' -->
       <parameter type-id='type-id-141'/>
-      <!-- parameter of type 'void (void*)*' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-138'/>
       <!-- int -->
       <return type-id='type-id-2'/>
@@ -2372,10 +2372,10 @@
       <!-- long int -->
       <return type-id='type-id-28'/>
     </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 type-id='type-id-133'/>
+      <!-- parameter of type 'void (*)(void)' -->
+      <parameter type-id='type-id-136'/>
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-decl>
@@ -2541,13 +2541,8 @@
       <!-- int -->
       <return type-id='type-id-2'/>
     </function-type>
-    <!-- void () -->
-    <function-type size-in-bits='64' id='type-id-132'>
-      <!-- void -->
-      <return type-id='type-id-99'/>
-    </function-type>
     <!-- void (diagnostic_context*, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-134'>
+    <function-type size-in-bits='64' id='type-id-132'>
       <!-- parameter of type 'diagnostic_context*' -->
       <parameter type-id='type-id-123'/>
       <!-- parameter of type 'const char*' -->
@@ -2558,7 +2553,7 @@
       <return type-id='type-id-99'/>
     </function-type>
     <!-- void (diagnostic_context*, diagnostic_info*) -->
-    <function-type size-in-bits='64' id='type-id-135'>
+    <function-type size-in-bits='64' id='type-id-133'>
       <!-- parameter of type 'diagnostic_context*' -->
       <parameter type-id='type-id-124'/>
       <!-- parameter of type 'diagnostic_info*' -->
@@ -2567,12 +2562,17 @@
       <return type-id='type-id-99'/>
     </function-type>
     <!-- void (int) -->
-    <function-type size-in-bits='64' id='type-id-136'>
+    <function-type size-in-bits='64' id='type-id-134'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-type>
+    <!-- void () -->
+    <function-type size-in-bits='64' id='type-id-135'>
+      <!-- void -->
+      <return type-id='type-id-99'/>
+    </function-type>
     <!-- void (void*) -->
     <function-type size-in-bits='64' id='type-id-137'>
       <!-- parameter of type 'void*' -->
@@ -2684,9 +2684,9 @@
     </class-decl>
     <!-- typedef expanded_location expanded_location -->
     <typedef-decl name='expanded_location' type-id='type-id-151' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-150'/>
-    <!-- typedef void* (void*, typedef size_t)* line_map_realloc -->
+    <!-- typedef void* (*)(void*, size_t) line_map_realloc -->
     <typedef-decl name='line_map_realloc' type-id='type-id-157' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-154'/>
-    <!-- typedef typedef size_t (typedef size_t)* line_map_round_alloc_size_func -->
+    <!-- typedef size_t (*)(size_t) line_map_round_alloc_size_func -->
     <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-158' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-155'/>
     <!-- const line_map** -->
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-159'/>
@@ -2694,9 +2694,9 @@
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-156'/>
     <!-- line_maps* -->
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-160'/>
-    <!-- typedef size_t (typedef size_t)* -->
+    <!-- size_t (*)(size_t) -->
     <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-158'/>
-    <!-- void* (void*, typedef size_t)* -->
+    <!-- void* (*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-157'/>
     <!-- unsigned long int concat_length(const char*, ...) -->
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3993,7 +3993,7 @@
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
     <!-- size_t* -->
     <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-174'/>
-    <!-- void* (typedef size_t)* -->
+    <!-- void* (*)(size_t) -->
     <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-176'/>
     <!-- char* xstrerror(int) -->
     <function-decl name='xstrerror' filepath='../.././gcc/../include/libiberty.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4182,9 +4182,9 @@
       <!-- void -->
       <return type-id='type-id-99'/>
     </function-decl>
-    <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
+    <!-- void* (* identifier_to_locale_alloc)(size_t) -->
     <var-decl name='identifier_to_locale_alloc' type-id='type-id-176' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
-    <!-- void (void*)* identifier_to_locale_free -->
+    <!-- void (* identifier_to_locale_free)(void*) -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-138' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- const char* identifier_to_locale(const char*) -->
     <function-decl name='identifier_to_locale' mangled-name='_Z20identifier_to_localePKc' filepath='../.././gcc/pretty-print.c' line='873' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20identifier_to_localePKc'>
@@ -4397,19 +4397,19 @@
     <typedef-decl name='file' type-id='type-id-179' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-196'/>
     <!-- typedef unsigned int hashval_t -->
     <typedef-decl name='hashval_t' type-id='type-id-52' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-197'/>
-    <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
+    <!-- typedef void* (*)(size_t, size_t) htab_alloc -->
     <typedef-decl name='htab_alloc' type-id='type-id-198' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-187'/>
-    <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
+    <!-- typedef void* (*)(void*, size_t, size_t) htab_alloc_with_arg -->
     <typedef-decl name='htab_alloc_with_arg' type-id='type-id-199' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-189'/>
-    <!-- typedef void (void*)* htab_del -->
+    <!-- typedef void (*)(void*) htab_del -->
     <typedef-decl name='htab_del' type-id='type-id-138' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-186'/>
-    <!-- typedef int (void*, void*)* htab_eq -->
+    <!-- typedef int (*)(void*, void*) htab_eq -->
     <typedef-decl name='htab_eq' type-id='type-id-200' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-185'/>
-    <!-- typedef void (void*)* htab_free -->
+    <!-- typedef void (*)(void*) htab_free -->
     <typedef-decl name='htab_free' type-id='type-id-138' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-188'/>
-    <!-- typedef void (void*, void*)* htab_free_with_arg -->
+    <!-- typedef void (*)(void*, void*) htab_free_with_arg -->
     <typedef-decl name='htab_free_with_arg' type-id='type-id-201' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-190'/>
-    <!-- typedef typedef hashval_t (void*)* htab_hash -->
+    <!-- typedef hashval_t (*)(void*) htab_hash -->
     <typedef-decl name='htab_hash' type-id='type-id-202' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-184'/>
     <!-- typedef htab* htab_t -->
     <typedef-decl name='htab_t' type-id='type-id-203' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-204'/>
@@ -4421,21 +4421,21 @@
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-192'/>
     <!-- file_stack_entry* -->
     <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-182'/>
+    <!-- hashval_t (*)(void*) -->
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-202'/>
     <!-- htab* -->
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-203'/>
-    <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-200'/>
+    <!-- int (*)(void*, void*) -->
+    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-200'/>
     <!-- symbol* -->
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-194'/>
     <!-- symbol_stack_entry* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
-    <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-202'/>
-    <!-- void (void*, void*)* -->
+    <!-- void (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-201'/>
-    <!-- void* (typedef size_t, typedef size_t)* -->
+    <!-- void* (*)(size_t, size_t) -->
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-198'/>
-    <!-- void* (void*, typedef size_t, typedef size_t)* -->
+    <!-- void* (*)(void*, size_t, size_t) -->
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-199'/>
     <!-- char* cplus_demangle(const char*, int) -->
     <function-decl name='cplus_demangle' filepath='../.././gcc/../include/demangle.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4542,7 +4542,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-206'>
+    <function-type size-in-bits='64' id='type-id-207'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-39'/>
       <!-- parameter of type 'void*' -->
@@ -4551,7 +4551,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-207'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-39'/>
       <!-- typedef hashval_t -->
@@ -4913,11 +4913,11 @@
     </enum-decl>
     <!-- typedef cpp_callbacks cpp_callbacks -->
     <typedef-decl name='cpp_callbacks' type-id='type-id-236' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-237'/>
-    <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
+    <!-- typedef int (*)(cpp_reader*, cpp_hashnode*, void*) cpp_cb -->
     <typedef-decl name='cpp_cb' type-id='type-id-238' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-239'/>
     <!-- typedef cpp_options cpp_options -->
     <typedef-decl name='cpp_options' type-id='type-id-240' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-241'/>
-    <!-- typedef void (cpp_reader*)* pragma_cb -->
+    <!-- typedef void (*)(cpp_reader*) pragma_cb -->
     <typedef-decl name='pragma_cb' type-id='type-id-242' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-243'/>
     <!-- cpp_callbacks* -->
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-244'/>
@@ -4925,7 +4925,7 @@
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-245'/>
     <!-- cpp_string* -->
     <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-226'/>
-    <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
+    <!-- int (*)(cpp_reader*, cpp_hashnode*, void*) -->
     <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-238'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-229'/>
@@ -5867,11 +5867,11 @@
         <var-decl name='d_name' type-id='type-id-266' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' 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-200' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-269'/>
     <!-- typedef long int __ssize_t -->
     <typedef-decl name='__ssize_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-270'/>
-    <!-- typedef int (void**, void*)* htab_trav -->
+    <!-- typedef int (*)(void**, void*) htab_trav -->
     <typedef-decl name='htab_trav' type-id='type-id-271' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-272'/>
     <!-- typedef __off_t off_t -->
     <typedef-decl name='off_t' type-id='type-id-35' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-273'/>
@@ -5881,7 +5881,7 @@
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-232'/>
     <!-- dirent* -->
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-275'/>
-    <!-- int (void**, void*)* -->
+    <!-- int (*)(void**, void*) -->
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-271'/>
     <!-- off_t* -->
     <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-233'/>
@@ -6314,9 +6314,9 @@
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libcpp/identifiers.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libcpp' language='LANG_C_plus_plus'>
-    <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
+    <!-- typedef int (*)(cpp_reader*, hashnode, void*) ht_cb -->
     <typedef-decl name='ht_cb' type-id='type-id-281' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-282'/>
-    <!-- int (cpp_reader*, typedef hashnode, void*)* -->
+    <!-- int (*)(cpp_reader*, hashnode, void*) -->
     <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-281'/>
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
@@ -7541,43 +7541,43 @@
     <!-- struct cpp_callbacks -->
     <class-decl name='cpp_callbacks' size-in-bits='1152' is-struct='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='499' column='1' id='type-id-236'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- void (cpp_reader*, const cpp_token*, int)* cpp_callbacks::line_change -->
+        <!-- void (* cpp_callbacks::line_change)(cpp_reader*, const cpp_token*, int) -->
         <var-decl name='line_change' type-id='type-id-329' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void (cpp_reader*, const line_map*)* cpp_callbacks::file_change -->
+        <!-- void (* cpp_callbacks::file_change)(cpp_reader*, const line_map*) -->
         <var-decl name='file_change' type-id='type-id-330' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void (cpp_reader*, const char*)* cpp_callbacks::dir_change -->
+        <!-- void (* cpp_callbacks::dir_change)(cpp_reader*, const char*) -->
         <var-decl name='dir_change' type-id='type-id-331' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* cpp_callbacks::include -->
+        <!-- void (* cpp_callbacks::include)(cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
         <var-decl name='include' type-id='type-id-332' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::define -->
+        <!-- void (* cpp_callbacks::define)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='define' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::undef -->
+        <!-- void (* cpp_callbacks::undef)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='undef' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* cpp_callbacks::ident -->
+        <!-- void (* cpp_callbacks::ident)(cpp_reader*, source_location, const cpp_string*) -->
         <var-decl name='ident' type-id='type-id-334' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- void (cpp_reader*, typedef source_location)* cpp_callbacks::def_pragma -->
+        <!-- void (* cpp_callbacks::def_pragma)(cpp_reader*, source_location) -->
         <var-decl name='def_pragma' type-id='type-id-335' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- int (cpp_reader*, const char*, int)* cpp_callbacks::valid_pch -->
+        <!-- int (* cpp_callbacks::valid_pch)(cpp_reader*, const char*, int) -->
         <var-decl name='valid_pch' type-id='type-id-336' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void (cpp_reader*, const char*, int, const char*)* cpp_callbacks::read_pch -->
+        <!-- void (* cpp_callbacks::read_pch)(cpp_reader*, const char*, int, const char*) -->
         <var-decl name='read_pch' type-id='type-id-337' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -7585,31 +7585,31 @@
         <var-decl name='missing_header' type-id='type-id-338' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* cpp_callbacks::macro_to_expand -->
+        <!-- cpp_hashnode* (* cpp_callbacks::macro_to_expand)(cpp_reader*, const cpp_token*) -->
         <var-decl name='macro_to_expand' type-id='type-id-339' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* cpp_callbacks::error -->
+        <!-- bool (* cpp_callbacks::error)(cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
         <var-decl name='error' type-id='type-id-340' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_define -->
+        <!-- void (* cpp_callbacks::used_define)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used_define' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used_undef -->
+        <!-- void (* cpp_callbacks::used_undef)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used_undef' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <!-- void (cpp_reader*)* cpp_callbacks::before_define -->
+        <!-- void (* cpp_callbacks::before_define)(cpp_reader*) -->
         <var-decl name='before_define' type-id='type-id-242' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* cpp_callbacks::used -->
+        <!-- void (* cpp_callbacks::used)(cpp_reader*, source_location, cpp_hashnode*) -->
         <var-decl name='used' type-id='type-id-333' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <!-- bool (cpp_reader*, cpp_hashnode*)* cpp_callbacks::user_builtin_macro -->
+        <!-- bool (* cpp_callbacks::user_builtin_macro)(cpp_reader*, cpp_hashnode*) -->
         <var-decl name='user_builtin_macro' type-id='type-id-341' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
@@ -7749,7 +7749,7 @@
         <var-decl name='name_map' type-id='type-id-253' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- char* (const char*, cpp_dir*)* cpp_dir::construct -->
+        <!-- char* (* cpp_dir::construct)(const char*, cpp_dir*) -->
         <var-decl name='construct' type-id='type-id-354' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -8354,11 +8354,11 @@
         <var-decl name='entries' type-id='type-id-373' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <!-- typedef hashnode (hash_table*)* ht::alloc_node -->
+        <!-- hashnode (* ht::alloc_node)(hash_table*) -->
         <var-decl name='alloc_node' type-id='type-id-374' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <!-- void* (typedef size_t)* ht::alloc_subobject -->
+        <!-- void* (* ht::alloc_subobject)(size_t) -->
         <var-decl name='alloc_subobject' type-id='type-id-176' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
@@ -8551,7 +8551,7 @@
     <typedef-decl name='_cpp_file' type-id='type-id-248' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-381'/>
     <!-- typedef _cpp_line_note _cpp_line_note -->
     <typedef-decl name='_cpp_line_note' type-id='type-id-322' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-382'/>
-    <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
+    <!-- typedef bool (*)(iconv_t, const unsigned char*, size_t, _cpp_strbuf*) convert_f -->
     <typedef-decl name='convert_f' type-id='type-id-383' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-369'/>
     <!-- typedef cpp_buffer cpp_buffer -->
     <typedef-decl name='cpp_buffer' type-id='type-id-323' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-384'/>
@@ -8575,7 +8575,7 @@
     <typedef-decl name='ino_t' type-id='type-id-84' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-355'/>
     <!-- typedef macro_context macro_context -->
     <typedef-decl name='macro_context' type-id='type-id-376' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-375'/>
-    <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
+    <!-- typedef const char* (*)(cpp_reader*, const char*, cpp_dir**) missing_header_cb -->
     <typedef-decl name='missing_header_cb' type-id='type-id-389' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-338'/>
     <!-- typedef __time_t time_t -->
     <typedef-decl name='time_t' type-id='type-id-96' filepath='/usr/include/time.h' line='76' column='1' id='type-id-390'/>
@@ -8606,15 +8606,15 @@
     <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-280'/>
     <!-- _cpp_line_note* -->
     <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-324'/>
-    <!-- bool (cpp_reader*, cpp_hashnode*)* -->
+    <!-- bool (*)(cpp_reader*, cpp_hashnode*) -->
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-341'/>
-    <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
+    <!-- bool (*)(cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
     <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-340'/>
-    <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
+    <!-- bool (*)(iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-383'/>
-    <!-- char* (const char*, cpp_dir*)* -->
+    <!-- char* (*)(const char*, cpp_dir*) -->
     <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-354'/>
-    <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
+    <!-- const char* (*)(cpp_reader*, const char*, cpp_dir**) -->
     <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-389'/>
     <!-- const char** -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-253'/>
@@ -8662,7 +8662,7 @@
     <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-251'/>
     <!-- cpp_dir** -->
     <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-408'/>
-    <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
+    <!-- cpp_hashnode* (*)(cpp_reader*, const cpp_token*) -->
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-339'/>
     <!-- cpp_reader* -->
     <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-285'/>
@@ -8674,49 +8674,49 @@
     <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-254'/>
     <!-- hash_table* -->
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-284'/>
+    <!-- hashnode (*)(hash_table*) -->
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-374'/>
     <!-- hashnode* -->
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-373'/>
     <!-- ht* -->
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-365'/>
     <!-- ht_identifier* -->
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-388'/>
-    <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-336'/>
+    <!-- int (*)(cpp_reader*, const char*, int) -->
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-336'/>
     <!-- macro_context* -->
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-347'/>
     <!-- op* -->
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-265'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-412'/>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-413'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
     <!-- tokenrun* -->
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-293'/>
-    <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-374'/>
     <!-- uchar* -->
     <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-231'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-257'/>
-    <!-- void (cpp_reader*)* -->
+    <!-- void (*)(cpp_reader*) -->
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-242'/>
-    <!-- void (cpp_reader*, const char*)* -->
+    <!-- void (*)(cpp_reader*, const char*) -->
     <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-331'/>
-    <!-- void (cpp_reader*, const char*, int, const char*)* -->
+    <!-- void (*)(cpp_reader*, const char*, int, const char*) -->
     <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-337'/>
-    <!-- void (cpp_reader*, const cpp_token*, int)* -->
+    <!-- void (*)(cpp_reader*, const cpp_token*, int) -->
     <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-329'/>
-    <!-- void (cpp_reader*, const line_map*)* -->
+    <!-- void (*)(cpp_reader*, const line_map*) -->
     <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-330'/>
-    <!-- void (cpp_reader*, typedef source_location)* -->
+    <!-- void (*)(cpp_reader*, source_location) -->
     <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-335'/>
-    <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
+    <!-- void (*)(cpp_reader*, source_location, const cpp_string*) -->
     <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-334'/>
-    <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
+    <!-- void (*)(cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
     <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-332'/>
-    <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
+    <!-- void (*)(cpp_reader*, source_location, cpp_hashnode*) -->
     <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-333'/>
     <!-- _cpp_strbuf* -->
     <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-423'/>
@@ -8899,7 +8899,7 @@
     <!-- time_t time(time_t*) -->
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-412'/>
       <!-- typedef time_t -->
       <return type-id='type-id-390'/>
     </function-decl>
@@ -8908,7 +8908,7 @@
       <!-- parameter of type 'const time_t*' -->
       <parameter type-id='type-id-404'/>
       <!-- tm* -->
-      <return type-id='type-id-412'/>
+      <return type-id='type-id-413'/>
     </function-decl>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8988,14 +8988,14 @@
       <return type-id='type-id-230'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-413'>
+    <function-type size-in-bits='64' id='type-id-410'>
       <!-- parameter of type 'hash_table*' -->
       <parameter type-id='type-id-284'/>
       <!-- typedef hashnode -->
       <return type-id='type-id-286'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-410'>
+    <function-type size-in-bits='64' id='type-id-411'>
       <!-- parameter of type 'cpp_reader*' -->
       <parameter type-id='type-id-222'/>
       <!-- parameter of type 'const char*' -->
@@ -9876,7 +9876,7 @@
         <var-decl name='number' type-id='type-id-28' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
-    <!-- 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-467' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-468'/>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
     <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-452'>
@@ -9947,7 +9947,7 @@
     <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-449'/>
     <!-- demangle_component** -->
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-450'/>
-    <!-- void (const char*, typedef size_t, void*)* -->
+    <!-- void (*)(const char*, size_t, void*) -->
     <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-467'/>
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
@@ -10601,39 +10601,39 @@
     <!-- struct pex_funcs -->
     <class-decl name='pex_funcs' size-in-bits='576' is-struct='yes' visibility='default' filepath='../.././libiberty/pex-common.h' line='99' column='1' id='type-id-490'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_read -->
+        <!-- int (* pex_funcs::open_read)(pex_obj*, const char*, int) -->
         <var-decl name='open_read' type-id='type-id-491' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- int (pex_obj*, const char*, int)* pex_funcs::open_write -->
+        <!-- int (* pex_funcs::open_write)(pex_obj*, const char*, int) -->
         <var-decl name='open_write' type-id='type-id-491' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* pex_funcs::exec_child -->
+        <!-- pid_t (* pex_funcs::exec_child)(pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
         <var-decl name='exec_child' type-id='type-id-492' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- int (pex_obj*, int)* pex_funcs::close -->
+        <!-- int (* pex_funcs::close)(pex_obj*, int) -->
         <var-decl name='close' type-id='type-id-493' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* pex_funcs::wait -->
+        <!-- pid_t (* pex_funcs::wait)(pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
         <var-decl name='wait' type-id='type-id-494' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- int (pex_obj*, int*, int)* pex_funcs::pipe -->
+        <!-- int (* pex_funcs::pipe)(pex_obj*, int*, int) -->
         <var-decl name='pipe' type-id='type-id-495' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenr -->
+        <!-- FILE* (* pex_funcs::fdopenr)(pex_obj*, int, int) -->
         <var-decl name='fdopenr' type-id='type-id-496' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- FILE* (pex_obj*, int, int)* pex_funcs::fdopenw -->
+        <!-- FILE* (* pex_funcs::fdopenw)(pex_obj*, int, int) -->
         <var-decl name='fdopenw' type-id='type-id-496' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- void (pex_obj*)* pex_funcs::cleanup -->
+        <!-- void (* pex_funcs::cleanup)(pex_obj*) -->
         <var-decl name='cleanup' type-id='type-id-497' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
@@ -10739,27 +10739,27 @@
     <typedef-decl name='__pid_t' type-id='type-id-2' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-499'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-499' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-500'/>
-    <!-- FILE* (pex_obj*, int, int)* -->
+    <!-- FILE* (*)(pex_obj*, int, int) -->
     <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-496'/>
     <!-- const pex_funcs -->
     <qualified-type-def type-id='type-id-490' const='yes' id='type-id-502'/>
     <!-- const pex_funcs* -->
     <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-147'/>
-    <!-- int (pex_obj*, const char*, int)* -->
+    <!-- int (*)(pex_obj*, const char*, int) -->
     <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-491'/>
-    <!-- int (pex_obj*, int)* -->
+    <!-- int (*)(pex_obj*, int) -->
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-493'/>
-    <!-- int (pex_obj*, int*, int)* -->
+    <!-- int (*)(pex_obj*, int*, int) -->
     <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-495'/>
     <!-- pex_time* -->
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-146'/>
-    <!-- pid_t* -->
-    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
-    <!-- typedef pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*)* -->
+    <!-- pid_t (*)(pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
     <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-492'/>
-    <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
+    <!-- pid_t (*)(pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
     <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-494'/>
-    <!-- void (pex_obj*)* -->
+    <!-- pid_t* -->
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
+    <!-- void (*)(pex_obj*) -->
     <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-497'/>
     <!-- pex_obj* pex_init_common(int, const char*, const char*, const pex_funcs*) -->
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
@@ -11214,8 +11214,8 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xexit.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <!-- void ()* _xexit_cleanup -->
-    <var-decl name='_xexit_cleanup' type-id='type-id-133' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
+    <!-- void (* _xexit_cleanup)(void) -->
+    <var-decl name='_xexit_cleanup' type-id='type-id-136' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- typedef long int __intptr_t -->
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index 1ceb92af..f9120693 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -32,15 +32,15 @@
     </array-type-def>
     <!-- int -->
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
+    <!-- int*(*[10])[4] -->
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='640' id='type-id-16'>
+      <!-- <anonymous range>[10] -->
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-17'/>
+    </array-type-def>
     <!-- int*[4] -->
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='256' id='type-id-19'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-17'/>
-    </array-type-def>
-    <!-- int*[4]*[10] -->
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
-      <!-- <anonymous range>[10] -->
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-20'/>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-20'/>
     </array-type-def>
     <!-- int[5] -->
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
@@ -64,8 +64,8 @@
         <var-decl name='c' type-id='type-id-11' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='5' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <!-- int*[4]* S::d[10] -->
-        <var-decl name='d' type-id='type-id-19' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
+        <!-- int*(* S::d[10])[4] -->
+        <var-decl name='d' type-id='type-id-16' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- char S::e[1] -->
@@ -81,9 +81,9 @@
     <!-- char* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
     <!-- int* -->
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-15'/>
-    <!-- int*[4]* -->
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-18'/>
+    <!-- int*(*)[4] -->
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-15'/>
     <!-- int foo(S&) -->
     <function-decl name='foo' mangled-name='_Z3fooR1S' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3fooR1S'>
       <!-- parameter of type 'S&' -->
diff --git a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
index 328ce804..224237e2 100644
--- a/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
+++ b/tests/data/test-diff-dwarf/PR25058-liblttng-ctl-report-1.txt
@@ -3,14 +3,14 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
 
 79 Added functions:
 
-  [A] 'function lttng_condition* lttng_condition_session_consumed_size_create()'
+  [A] 'function lttng_condition* lttng_condition_session_consumed_size_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_get_session_name(const lttng_condition*, const char**)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_get_threshold(const lttng_condition*, uint64_t*)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_set_session_name(lttng_condition*, const char*)'
   [A] 'function lttng_condition_status lttng_condition_session_consumed_size_set_threshold(lttng_condition*, uint64_t)'
-  [A] 'function lttng_condition* lttng_condition_session_rotation_completed_create()'
+  [A] 'function lttng_condition* lttng_condition_session_rotation_completed_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_rotation_get_session_name(const lttng_condition*, const char**)'
-  [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_create()'
+  [A] 'function lttng_condition* lttng_condition_session_rotation_ongoing_create(void)'
   [A] 'function lttng_condition_status lttng_condition_session_rotation_set_session_name(lttng_condition*, const char*)'
   [A] 'function lttng_error_code lttng_create_session_ext(lttng_session_descriptor*)'
   [A] 'function lttng_error_code lttng_destroy_session_ext(const char*, lttng_destruction_handle**)'
@@ -24,7 +24,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function lttng_evaluation_status lttng_evaluation_session_consumed_size_get_consumed_size(const lttng_evaluation*, uint64_t*)'
   [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_completed_get_location(const lttng_evaluation*, const lttng_trace_archive_location**)'
   [A] 'function lttng_evaluation_status lttng_evaluation_session_rotation_get_id(const lttng_evaluation*, uint64_t*)'
-  [A] 'function lttng_event* lttng_event_create()'
+  [A] 'function lttng_event* lttng_event_create(void)'
   [A] 'function void lttng_event_destroy(lttng_event*)'
   [A] 'function const lttng_userspace_probe_location* lttng_event_get_userspace_probe_location(const lttng_event*)'
   [A] 'function int lttng_event_set_userspace_probe_location(lttng_event*, lttng_userspace_probe_location*)'
@@ -35,10 +35,10 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function lttng_rotation_status lttng_rotation_handle_get_state(lttng_rotation_handle*, lttng_rotation_state*)'
   [A] 'function void lttng_rotation_schedule_destroy(lttng_rotation_schedule*)'
   [A] 'function lttng_rotation_schedule_type lttng_rotation_schedule_get_type(const lttng_rotation_schedule*)'
-  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_create()'
+  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_periodic_create(void)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_get_period(const lttng_rotation_schedule*, uint64_t*)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_periodic_set_period(lttng_rotation_schedule*, uint64_t)'
-  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_threshold_create()'
+  [A] 'function lttng_rotation_schedule* lttng_rotation_schedule_size_threshold_create(void)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_size_threshold_get_threshold(const lttng_rotation_schedule*, uint64_t*)'
   [A] 'function lttng_rotation_status lttng_rotation_schedule_size_threshold_set_threshold(lttng_rotation_schedule*, uint64_t)'
   [A] 'function void lttng_rotation_schedules_destroy(lttng_rotation_schedules*)'
@@ -74,9 +74,9 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
   [A] 'function const lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_get_lookup_method(const lttng_userspace_probe_location*)'
   [A] 'function lttng_userspace_probe_location_type lttng_userspace_probe_location_get_type(const lttng_userspace_probe_location*)'
   [A] 'function void lttng_userspace_probe_location_lookup_method_destroy(lttng_userspace_probe_location_lookup_method*)'
-  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_function_elf_create()'
+  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_function_elf_create(void)'
   [A] 'function lttng_userspace_probe_location_lookup_method_type lttng_userspace_probe_location_lookup_method_get_type(const lttng_userspace_probe_location_lookup_method*)'
-  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create()'
+  [A] 'function lttng_userspace_probe_location_lookup_method* lttng_userspace_probe_location_lookup_method_tracepoint_sdt_create(void)'
   [A] 'function lttng_userspace_probe_location* lttng_userspace_probe_location_tracepoint_create(const char*, const char*, const char*, lttng_userspace_probe_location_lookup_method*)'
   [A] 'function int lttng_userspace_probe_location_tracepoint_get_binary_fd(const lttng_userspace_probe_location*)'
   [A] 'function const char* lttng_userspace_probe_location_tracepoint_get_binary_path(const lttng_userspace_probe_location*)'
@@ -91,12 +91,12 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
         type size hasn't changed
         3 data member changes:
           type of 'action_validate_cb validate' changed:
-            underlying type 'bool (lttng_action*)*' changed:
+            underlying type 'bool (*)(lttng_action*)' changed:
               in pointed to type 'function type bool (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
                   pointed to type 'struct lttng_action' changed, as being reported
           type of 'action_serialize_cb serialize' changed:
-            underlying type 'typedef ssize_t (lttng_action*, char*)*' changed:
+            underlying type 'ssize_t (*)(lttng_action*, char*)' changed:
               in pointed to type 'function type typedef ssize_t (lttng_action*, char*)':
                 return type changed:
                   entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -109,7 +109,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     entity changed from 'char' to 'struct lttng_dynamic_buffer'
                     type size changed from 8 to 192 (in bits)
           type of 'action_destroy_cb destroy' changed:
-            underlying type 'void (lttng_action*)*' changed:
+            underlying type 'void (*)(lttng_action*)' changed:
               in pointed to type 'function type void (lttng_action*)':
                 parameter 1 of type 'lttng_action*' has sub-type changes:
                   pointed to type 'struct lttng_action' changed, as being reported
@@ -118,7 +118,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
     parameter 1 of type 'lttng_action*' has sub-type changes:
       pointed to type 'struct lttng_action' changed, as reported earlier
 
-  [C] 'function lttng_action* lttng_action_notify_create()' has some indirect sub-type changes:
+  [C] 'function lttng_action* lttng_action_notify_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_action' changed, as reported earlier
 
@@ -146,13 +146,13 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING' value '103'
                 'lttng_condition_type::LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED' value '104'
             type of 'condition_validate_cb validate' changed:
-              underlying type 'bool (const lttng_condition*)*' changed:
+              underlying type 'bool (*)(const lttng_condition*)' changed:
                 in pointed to type 'function type bool (const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
             type of 'condition_serialize_cb serialize' changed:
-              underlying type 'typedef ssize_t (const lttng_condition*, char*)*' changed:
+              underlying type 'ssize_t (*)(const lttng_condition*, char*)' changed:
                 in pointed to type 'function type typedef ssize_t (const lttng_condition*, char*)':
                   return type changed:
                     entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -166,7 +166,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
             type of 'condition_equal_cb equal' changed:
-              underlying type 'bool (const lttng_condition*, const lttng_condition*)*' changed:
+              underlying type 'bool (*)(const lttng_condition*, const lttng_condition*)' changed:
                 in pointed to type 'function type bool (const lttng_condition*, const lttng_condition*)':
                   parameter 1 of type 'const lttng_condition*' has sub-type changes:
                     in pointed to type 'const lttng_condition':
@@ -175,7 +175,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                     in pointed to type 'const lttng_condition':
                       unqualified underlying type 'struct lttng_condition' changed, as being reported
             type of 'condition_destroy_cb destroy' changed:
-              underlying type 'void (lttng_condition*)*' changed:
+              underlying type 'void (*)(lttng_condition*)' changed:
                 in pointed to type 'function type void (lttng_condition*)':
                   parameter 1 of type 'lttng_condition*' has sub-type changes:
                     pointed to type 'struct lttng_condition' changed, as being reported
@@ -200,11 +200,11 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
       in pointed to type 'const lttng_condition':
         unqualified underlying type 'struct lttng_condition' changed, as reported earlier
 
-  [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create()' has some indirect sub-type changes:
+  [C] 'function lttng_condition* lttng_condition_buffer_usage_high_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_condition' changed, as reported earlier
 
-  [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create()' has some indirect sub-type changes:
+  [C] 'function lttng_condition* lttng_condition_buffer_usage_low_create(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'struct lttng_condition' changed, as reported earlier
 
@@ -269,7 +269,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
           3 data member changes:
             type of 'lttng_condition_type type' changed, as reported earlier
             type of 'evaluation_serialize_cb serialize' changed:
-              underlying type 'typedef ssize_t (lttng_evaluation*, char*)*' changed:
+              underlying type 'ssize_t (*)(lttng_evaluation*, char*)' changed:
                 in pointed to type 'function type typedef ssize_t (lttng_evaluation*, char*)':
                   return type changed:
                     entity changed from 'typedef ssize_t' to compatible type 'int'
@@ -284,7 +284,7 @@ Variables changes summary: 0 Removed, 0 Changed, 3 Added variables
                       entity changed from 'char' to 'struct lttng_dynamic_buffer'
                       type size changed from 8 to 192 (in bits)
             type of 'evaluation_destroy_cb destroy' changed:
-              underlying type 'void (lttng_evaluation*)*' changed:
+              underlying type 'void (*)(lttng_evaluation*)' changed:
                 in pointed to type 'function type void (lttng_evaluation*)':
                   parameter 1 of type 'lttng_evaluation*' has sub-type changes:
                     pointed to type 'struct lttng_evaluation' changed, as being reported
diff --git a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
index c5a6e0a3..5d082418 100644
--- a/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
+++ b/tests/data/test-diff-dwarf/test-23-diff-arch-report-0.txt
@@ -6,6 +6,6 @@ architecture changed from 'elf-intel-80386' to 'elf-amd-x86_64'
 
 1 function with some indirect sub-type change:
 
-  [C] 'function int foo()' has some indirect sub-type changes:
+  [C] 'function int foo(void)' has some indirect sub-type changes:
     address size of function changed from 32 bits to 64 bits
 
diff --git a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
index 9683d745..672aa27f 100644
--- a/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
+++ b/tests/data/test-diff-dwarf/test18-alias-sym-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'
+  [A] 'function void bar(void)'
 
diff --git a/tests/data/test-diff-dwarf/test19-soname-report-0.txt b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
index 45df5856..19b43add 100644
--- a/tests/data/test-diff-dwarf/test19-soname-report-0.txt
+++ b/tests/data/test-diff-dwarf/test19-soname-report-0.txt
@@ -6,5 +6,5 @@ SONAME changed from 'libtest19-soname-0' to 'libtest19-soname-1'
 
 1 Added function:
 
-  [A] 'function void func1()'
+  [A] 'function void func1(void)'
 
diff --git a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
index e270f48b..7a30831f 100644
--- a/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
+++ b/tests/data/test-diff-dwarf/test24-added-fn-parms-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void fun()' has some indirect sub-type changes:
+  [C] 'function void fun(void)' has some indirect sub-type changes:
     parameter 1 of type 'unsigned int' was added
     parameter 2 of type 'char' was added
     parameter 3 of type 'int' was added
diff --git a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
index 3238e4c9..2ba0e64a 100644
--- a/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test32-fnptr-changes-report-0.txt
@@ -11,15 +11,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C] 'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0(void)' has some indirect sub-type changes:
     return type changed:
-      underlying type 'int (int)*' changed:
+      underlying type 'int (*)(int)' changed:
         in pointed to type 'function type int (int)':
           return type changed:
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C] 'function double (int)* fn1()' has some indirect sub-type changes:
+  [C] 'function double (*fn1(void))(int)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'function type double (int)':
         return type changed:
@@ -30,14 +30,14 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     parameter 1 of type 'class S' has sub-type changes:
       type size hasn't changed
       3 data member changes:
-        type of 'int ()* fnptr0' changed:
-          in pointed to type 'function type int ()':
+        type of 'int (* fnptr0)(void)' changed:
+          in pointed to type 'function type int (void)':
             parameter 1 of type 'double' was added
-        type of 'int ()* fnptr1' changed:
-          in pointed to type 'function type int ()':
-            entity changed from 'function type int ()' to 'void'
+        type of 'int (* fnptr1)(void)' changed:
+          in pointed to type 'function type int (void)':
+            entity changed from 'function type int (void)' to 'void'
             type size changed from 64 to 0 (in bits)
-        type of 'int ()* fnptr2' changed:
-          entity changed from 'int ()*' to 'int'
+        type of 'int (* fnptr2)(void)' changed:
+          entity changed from 'int (*)(void)' to 'int'
           type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
index d16753c7..1d76043e 100644
--- a/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
+++ b/tests/data/test-diff-dwarf/test33-fnref-changes-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 3 functions with some indirect sub-type change:
 
-  [C] 'function callback fn0()' has some indirect sub-type changes:
+  [C] 'function callback fn0(void)' has some indirect sub-type changes:
     return type changed:
       underlying type 'int (int)&' changed:
         in referenced type 'function type int (int)':
@@ -19,7 +19,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             type name changed from 'int' to 'void'
             type size changed from 32 to 0 (in bits)
 
-  [C] 'function double (int)& fn1()' has some indirect sub-type changes:
+  [C] 'function double (int)& fn1(void)' has some indirect sub-type changes:
     return type changed:
       in referenced type 'function type double (int)':
         return type changed:
@@ -31,15 +31,15 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in referenced type 'class S':
         type size hasn't changed
         3 data member changes:
-          type of 'int ()& fnref0' changed:
-            in referenced type 'function type int ()':
+          type of 'int (& fnref0)(void)' changed:
+            in referenced type 'function type int (void)':
               parameter 1 of type 'double' was added
-          type of 'int ()& fnref1' changed:
-            in referenced type 'function type int ()':
-              entity changed from 'function type int ()' to 'int*'
+          type of 'int (& fnref1)(void)' changed:
+            in referenced type 'function type int (void)':
+              entity changed from 'function type int (void)' to 'int*'
               type size hasn't changed
-          type of 'int ()& fnref2' changed:
-            in referenced type 'function type int ()':
-              entity changed from 'function type int ()' to 'int'
+          type of 'int (& fnref2)(void)' changed:
+            in referenced type 'function type int (void)':
+              entity changed from 'function type int (void)' to 'int'
               type size changed from 64 to 32 (in bits)
 
diff --git a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
index fad1ed9a..bc148f3d 100644
--- a/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
+++ b/tests/data/test-diff-dwarf/test41-PR20476-hidden-report-0.txt
@@ -32,7 +32,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
     implicit parameter 0 of type 'Interface*' has sub-type changes:
       pointed to type 'class Interface' changed, as reported earlier
 
-  [C] 'function Interface* make_interface()' has some indirect sub-type changes:
+  [C] 'function Interface* make_interface(void)' has some indirect sub-type changes:
     return type changed:
       pointed to type 'class Interface' changed, as reported earlier
 
diff --git a/tests/data/test-diff-dwarf/test5-report.txt b/tests/data/test-diff-dwarf/test5-report.txt
index ba721004..9cf2af80 100644
--- a/tests/data/test-diff-dwarf/test5-report.txt
+++ b/tests/data/test-diff-dwarf/test5-report.txt
@@ -10,7 +10,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
         1 data member change:
           'int m0' access changed from 'private' to 'public'
 
-  [C] 'function C0 foo()' has some indirect sub-type changes:
+  [C] 'function C0 foo(void)' has some indirect sub-type changes:
     return type changed:
       entity changed from 'class C0' to compatible type 'typedef c0_type'
         details were reported earlier
diff --git a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
index 8989efd7..a9ce8065 100644
--- a/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
+++ b/tests/data/test-diff-filter/test-PR26739-2-report-0.txt
@@ -12,6 +12,6 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             entity changed from 'const volatile int[5]' to compatible type 'typedef array_type1' at test-PR26739-2-v1.c:3:1
               array element type 'const volatile int' changed:
                 'const volatile int' changed to 'const int'
-              type name changed from 'const volatile int[5]' to 'const int[5]'
+              type name changed from 'volatile const int[5]' to 'const int[5]'
               type size hasn't changed
 
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
index 2c64c39f..c73ce1aa 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-0.txt
@@ -11,7 +11,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               1 data member changes (1 filtered):
-                type of 'FooStruct::Embedded* m1' changed:
+                type of 'Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
diff --git a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
index 9af85bdc..587688ec 100644
--- a/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
+++ b/tests/data/test-diff-filter/test26-qualified-redundant-node-report-1.txt
@@ -11,12 +11,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
             underlying type 'struct S' changed:
               type size hasn't changed
               2 data member changes:
-                type of 'FooStruct::Embedded* m1' changed:
+                type of 'Embedded* m1' changed:
                   in pointed to type 'struct FooStruct::Embedded':
                     type size hasn't changed
                     1 data member insertion:
                       'char m1', at offset 32 (in bits)
-                type of 'FooStruct::Embedded** m2' changed:
+                type of 'Embedded** m2' changed:
                   in pointed to type 'FooStruct::Embedded*':
                     pointed to type 'struct FooStruct::Embedded' changed, as reported earlier
 
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
index 77510262..d2ba56bc 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report0.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra':
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
index d555711f..dca2fab7 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report1.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:4245:1 has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
index 7058b67a..1d214576 100644
--- a/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
+++ b/tests/data/test-diff-filter/test30-pr18904-rvalueref-report2.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -308,13 +308,13 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator++()'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > > __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator-(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::difference_type) const'
   [A] 'method __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >& __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >::operator--()'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Iter_comp_val(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, const VarTable::Entry*>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, const VarTable::Entry*&)'
-  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'method void __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::_Val_comp_iter(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'method bool __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>::operator()<const VarTable::Entry*, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> > >(const VarTable::Entry*&, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >)'
-  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function __gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function __gnu_cxx::__ops::_Iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__iter_comp_val<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'function __gnu_cxx::__ops::_Val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)> __gnu_cxx::__ops::__val_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__ops::_Iter_comp_iter<bool (*)(const VarTable::Entry*, const VarTable::Entry*)>)'
   [A] 'method __gnu_cxx::new_allocator<const VarTable::Entry*>::pointer __gnu_cxx::new_allocator<const VarTable::Entry*>::allocate(__gnu_cxx::new_allocator<const VarTable::Entry*>::size_type, void*)'
@@ -1154,7 +1154,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [A] 'method std::pair<std::_Rb_tree_const_iterator<PtrData>, bool> std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::insert(std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::value_type&)'
   [A] 'method void std::set<PtrData, std::less<PtrData>, std::allocator<PtrData> >::set()'
   [A] 'function std::_Setprecision std::setprecision(int)'
-  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (const VarTable::Entry*, const VarTable::Entry*)*)'
+  [A] 'function void std::sort<__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*> >, bool (*)(const VarTable::Entry*, const VarTable::Entry*)>(__gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, __gnu_cxx::__normal_iterator<const VarTable::Entry**, std::vector<const VarTable::Entry*, std::allocator<const VarTable::Entry*> > >, bool (*)(const VarTable::Entry*, const VarTable::Entry*))'
   [A] 'function void std::swap<const VarTable::Entry*>(const VarTable::Entry*&, const VarTable::Entry*&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple(std::tuple<long unsigned int const&>&)'
   [A] 'method void std::tuple<long unsigned int const&>::tuple<void, 1u>(const unsigned long int&)'
@@ -1263,7 +1263,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra' at offload_host.h:216:1:
               type size changed from 0x48 to 0x50 (in bytes)
               2 data member insertions:
@@ -1418,8 +1418,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry' at offload_table.h:296:1
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' at offload_host.cpp:4245:1 has some indirect sub-type changes:
@@ -1435,28 +1435,28 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
@@ -1485,10 +1485,10 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 11 Added variables:
 
-  [A] 'typedef COIRESULT (typedef COIENGINE, typedef uint32_t, COI_ENGINE_INFO*)* COI::EngineGetInfo'
-  [A] 'typedef COIRESULT (typedef COIEVENT, void (typedef COIEVENT, typedef COIRESULT, void*)*, void*, typedef uint64_t)* COI::EventRegisterCallback'
-  [A] 'typedef COIRESULT (uint64_t*)* COI::PipelineClearCPUMask'
-  [A] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, typedef uint8_t, uint64_t*)* COI::PipelineSetCPUMask'
+  [A] 'COIRESULT (* COI::EngineGetInfo)(COIENGINE, uint32_t, COI_ENGINE_INFO*)'
+  [A] 'COIRESULT (* COI::EventRegisterCallback)(COIEVENT, void (*)(COIEVENT, COIRESULT, void*), void*, uint64_t)'
+  [A] 'COIRESULT (* COI::PipelineClearCPUMask)(uint64_t*)'
+  [A] 'COIRESULT (* COI::PipelineSetCPUMask)(COIPROCESS, uint32_t, uint8_t, uint64_t*)'
   [A] 'static Stream::StreamMap Stream::all_streams'
   [A] 'static mutex_t Stream::m_stream_lock'
   [A] 'static uint64_t Stream::m_streams_count'
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
index 08c01085..6cd782f4 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-0.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)'
   [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
   [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
@@ -20,25 +20,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     note that this adds a new entry to the vtable of class std::bad_array_new_length
   [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  [A] 'function std::new_handler std::get_new_handler()'
-  [A] 'function std::terminate_handler std::get_terminate()'
-  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'function std::new_handler std::get_new_handler(void)'
+  [A] 'function std::terminate_handler std::get_terminate(void)'
+  [A] 'function std::unexpected_handler std::get_unexpected(void)'
   [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception(void)' has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception':
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __padding', at offset 32 (in bits)
+          'void (* __padding)(void*)', at offset 32 (in bits)
         6 data member changes:
           'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
           'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          '__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
           'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          '__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
           'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
index e17ef594..9c333b6e 100644
--- a/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
+++ b/tests/data/test-diff-filter/test31-pr18535-libstdc++-report-1.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
 
 13 Added functions:
 
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length()'
-  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length()'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_length(void)'
+  [A] 'function void __cxxabiv1::__cxa_throw_bad_array_new_length(void)'
   [A] 'function void std::__throw_out_of_range_fmt(const char*, ...)'
   [A] 'method virtual const char* std::bad_array_length::what() const'
     note that this adds a new entry to the vtable of class std::bad_array_length
@@ -20,25 +20,25 @@ Variable symbols changes summary: 0 Removed, 6 Added variable symbols not refere
     note that this adds a new entry to the vtable of class std::bad_array_new_length
   [A] 'method virtual std::bad_array_new_length::~bad_array_new_length(int)'
     note that this adds a new entry to the vtable of class std::bad_array_new_length
-  [A] 'function std::new_handler std::get_new_handler()'
-  [A] 'function std::terminate_handler std::get_terminate()'
-  [A] 'function std::unexpected_handler std::get_unexpected()'
+  [A] 'function std::new_handler std::get_new_handler(void)'
+  [A] 'function std::terminate_handler std::get_terminate(void)'
+  [A] 'function std::unexpected_handler std::get_unexpected(void)'
   [A] 'method std::regex_error::regex_error(std::regex_constants::error_type)'
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception()' at eh_alloc.cc:158:1 has some indirect sub-type changes:
+  [C] 'function __cxxabiv1::__cxa_dependent_exception* __cxxabiv1::__cxa_allocate_dependent_exception(void)' at eh_alloc.cc:158:1 has some indirect sub-type changes:
     return type changed:
       in pointed to type 'struct __cxxabiv1::__cxa_dependent_exception' at unwind-cxx.h:112:1:
         type size hasn't changed
         1 data member insertion:
-          'void (void*)* __padding', at offset 32 (in bits) at unwind-cxx.h:120:1
+          'void (* __padding)(void*)', at offset 32 (in bits) at unwind-cxx.h:120:1
         6 data member changes:
           'std::unexpected_handler unexpectedHandler' offset changed from 32 to 64 (in bits) (by +32 bits)
           'std::terminate_handler terminateHandler' offset changed from 64 to 96 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
+          '__cxa_exception* nextException' offset changed from 96 to 128 (in bits) (by +32 bits)
           'int handlerCount' offset changed from 128 to 160 (in bits) (by +32 bits)
-          '__cxxabiv1::__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
+          '__cxa_exception* nextPropagatingException' offset changed from 160 to 192 (in bits) (by +32 bits)
           'int propagationCount' offset changed from 192 to 224 (in bits) (by +32 bits)
 
   [C] 'function void std::__throw_regex_error(std::regex_constants::error_type)' at functexcept.cc:116:1 has some indirect sub-type changes:
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
index e14819a4..079d4de5 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-0.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
@@ -179,7 +179,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst;}
                     to:
                       struct {uint32_t is_static; uint32_t is_static_dstn; uint32_t has_length; uint32_t is_stack_buf; uint32_t targetptr; uint32_t preallocated; uint32_t is_pointer; uint32_t sink_addr; uint32_t alloc_disp; uint32_t is_noncont_src; uint32_t is_noncont_dst; uint32_t always_copy; uint32_t always_delete; uint32_t pin;}
-          type of 'OffloadDescriptor::VarExtra* m_vars_extra' changed:
+          type of 'VarExtra* m_vars_extra' changed:
             in pointed to type 'struct OffloadDescriptor::VarExtra':
               type size changed from 576 to 640 (in bits)
               2 data member insertions:
@@ -334,8 +334,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
         entity changed from 'struct InitTableEntry' to compatible type 'typedef InitTableEntry'
           type size hasn't changed
           1 data member change:
-            type of 'void ()* func' changed:
-              in pointed to type 'function type void ()':
+            type of 'void (* func)(void)' changed:
+              in pointed to type 'function type void (void)':
                 parameter 1 of type 'typedef MyoArena' was added
 
   [C] 'function void __offload_register_image(void*)' has some indirect sub-type changes:
@@ -351,28 +351,28 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 47 Removed variables:
 
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferCopy'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreate'
-  [D] 'typedef COIRESULT (typedef uint64_t, typedef COI_BUFFER_TYPE, typedef uint32_t, void*, typedef uint32_t, const COIPROCESS*, COIBUFFER*)* COI::BufferCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIBUFFER)* COI::BufferDestroy'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, uint64_t*)* COI::BufferGetSinkAddress'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, typedef uint64_t, typedef COI_MAP_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)* COI::BufferMap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferRead'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef COIPROCESS, typedef COI_BUFFER_STATE, typedef COI_BUFFER_MOVE_FLAG, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferSetState'
-  [D] 'typedef COIRESULT (typedef COIMAPINSTANCE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferUnmap'
-  [D] 'typedef COIRESULT (typedef COIBUFFER, typedef uint64_t, void*, typedef uint64_t, typedef COI_COPY_TYPE, typedef uint32_t, const COIEVENT*, COIEVENT*)* COI::BufferWrite'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, uint32_t*)* COI::EngineGetCount'
-  [D] 'typedef COIRESULT (typedef COI_ISA_TYPE, typedef uint32_t, COIENGINE*)* COI::EngineGetHandle'
-  [D] 'typedef COIRESULT (typedef uint16_t, const COIEVENT*, typedef int32_t, typedef uint8_t, uint32_t*, uint32_t*)* COI::EventWait'
-  [D] 'typedef uint64_t ()* COI::PerfGetCycleFrequency'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, uint64_t*, typedef uint32_t, COIPIPELINE*)* COI::PipelineCreate'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE)* COI::PipelineDestroy'
-  [D] 'typedef COIRESULT (typedef COIPIPELINE, typedef COIFUNCTION, typedef uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, typedef uint32_t, const COIEVENT*, void*, typedef uint16_t, void*, typedef uint16_t, COIEVENT*)* COI::PipelineRunFunction'
-  [D] 'typedef COIRESULT (typedef COIENGINE, const char*, void*, typedef uint64_t, int, const char**, typedef uint8_t, const char**, typedef uint8_t, const char*, typedef uint64_t, const char*, const char*, typedef uint64_t, COIPROCESS*)* COI::ProcessCreateFromMemory'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef int32_t, typedef uint8_t, int8_t*, uint32_t*)* COI::ProcessDestroy'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, typedef uint32_t, const char**, COIFUNCTION*)* COI::ProcessGetFunctionHandles'
-  [D] 'typedef COIRESULT (typedef COIPROCESS, void*, typedef uint64_t, const char*, const char*, const char*, typedef uint64_t, typedef uint32_t, COILIBRARY*)* COI::ProcessLoadLibraryFromMemory'
-  [D] 'typedef COIRESULT (typedef uint32_t, void**, const uint64_t*, const char**, const uint64_t*)* COI::ProcessRegisterLibraries'
+  [D] 'COIRESULT (* COI::BufferCopy)(COIBUFFER, COIBUFFER, uint64_t, uint64_t, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferCreate)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferCreateFromMemory)(uint64_t, COI_BUFFER_TYPE, uint32_t, void*, uint32_t, const COIPROCESS*, COIBUFFER*)'
+  [D] 'COIRESULT (* COI::BufferDestroy)(COIBUFFER)'
+  [D] 'COIRESULT (* COI::BufferGetSinkAddress)(COIBUFFER, uint64_t*)'
+  [D] 'COIRESULT (* COI::BufferMap)(COIBUFFER, uint64_t, uint64_t, COI_MAP_TYPE, uint32_t, const COIEVENT*, COIEVENT*, COIMAPINSTANCE*, void**)'
+  [D] 'COIRESULT (* COI::BufferRead)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferSetState)(COIBUFFER, COIPROCESS, COI_BUFFER_STATE, COI_BUFFER_MOVE_FLAG, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferUnmap)(COIMAPINSTANCE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::BufferWrite)(COIBUFFER, uint64_t, void*, uint64_t, COI_COPY_TYPE, uint32_t, const COIEVENT*, COIEVENT*)'
+  [D] 'COIRESULT (* COI::EngineGetCount)(COI_ISA_TYPE, uint32_t*)'
+  [D] 'COIRESULT (* COI::EngineGetHandle)(COI_ISA_TYPE, uint32_t, COIENGINE*)'
+  [D] 'COIRESULT (* COI::EventWait)(uint16_t, const COIEVENT*, int32_t, uint8_t, uint32_t*, uint32_t*)'
+  [D] 'uint64_t (* COI::PerfGetCycleFrequency)(void)'
+  [D] 'COIRESULT (* COI::PipelineCreate)(COIPROCESS, uint64_t*, uint32_t, COIPIPELINE*)'
+  [D] 'COIRESULT (* COI::PipelineDestroy)(COIPIPELINE)'
+  [D] 'COIRESULT (* COI::PipelineRunFunction)(COIPIPELINE, COIFUNCTION, uint32_t, const COIBUFFER*, const COI_ACCESS_FLAGS*, uint32_t, const COIEVENT*, void*, uint16_t, void*, uint16_t, COIEVENT*)'
+  [D] 'COIRESULT (* COI::ProcessCreateFromMemory)(COIENGINE, const char*, void*, uint64_t, int, const char**, uint8_t, const char**, uint8_t, const char*, uint64_t, const char*, const char*, uint64_t, COIPROCESS*)'
+  [D] 'COIRESULT (* COI::ProcessDestroy)(COIPROCESS, int32_t, uint8_t, int8_t*, uint32_t*)'
+  [D] 'COIRESULT (* COI::ProcessGetFunctionHandles)(COIPROCESS, uint32_t, const char**, COIFUNCTION*)'
+  [D] 'COIRESULT (* COI::ProcessLoadLibraryFromMemory)(COIPROCESS, void*, uint64_t, const char*, const char*, const char*, uint64_t, uint32_t, COILIBRARY*)'
+  [D] 'COIRESULT (* COI::ProcessRegisterLibraries)(uint32_t, void**, const uint64_t*, const char**, const uint64_t*)'
   [D] 'bool COI::is_available'
   [D] 'static const int MicEnvVar::any_card'
   [D] 'FuncList __offload_entries'
diff --git a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
index 9e12abd2..42f4a1dd 100644
--- a/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
+++ b/tests/data/test-diff-filter/test35-pr18754-no-added-syms-report-1.txt
@@ -5,8 +5,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
 
 82 Removed functions:
 
-  [D] 'function void COI::fini()'
-  [D] 'function bool COI::init()'
+  [D] 'function void COI::fini(void)'
+  [D] 'function bool COI::init(void)'
   [D] 'function void* DL_sym(void*, const char*, const char*)'
   [D] 'method COIRESULT Engine::compute(const std::__cxx11::list<coibuffer*, std::allocator<coibuffer*> >&, void*, uint16_t, void*, uint16_t, uint32_t, const COIEVENT*, COIEVENT*)'
   [D] 'method void FuncList::dump()'
@@ -24,7 +24,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method void MicEnvVar::mic_parse_env_var_list(int, char*)'
   [D] 'method MicEnvVar::~MicEnvVar(int)'
   [D] 'method bool MyoWrapper::LoadLibrary()'
-  [D] 'function void ORSL::init()'
+  [D] 'function void ORSL::init(void)'
   [D] 'function void ORSL::release(int)'
   [D] 'function bool ORSL::reserve(int)'
   [D] 'function bool ORSL::try_reserve(int)'
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'method bool OffloadDescriptor::wait_dependencies(void**, int)'
   [D] 'function void Offload_Report_Epilog(OffloadHostTimerData*)'
   [D] 'function void Offload_Report_Prolog(OffloadHostTimerData*)'
-  [D] 'function void Offload_Timer_Print()'
+  [D] 'function void Offload_Timer_Print(void)'
   [D] 'method void VarList::dump()'
   [D] 'method void VarList::table_copy(void*, int64_t)'
   [D] 'method void VarList::table_patch_names(int64_t)'
@@ -54,8 +54,8 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
   [D] 'function bool __dv_is_allocated(const ArrDesc*)'
   [D] 'function bool __dv_is_contiguous(const ArrDesc*)'
   [D] 'function void __liboffload_error_support(error_types, ...)'
-  [D] 'function int __offload_init_library()'
-  [D] 'function void __offload_myoFini()'
+  [D] 'function int __offload_init_library(void)'
+  [D] 'function void __offload_myoFini(void)'
   [D] 'function bool __offload_parse_int_string(const char*, int64_t&)'
   [D] 'function bool __offload_parse_size_string(const char*, uint64_t&)'
   [D] 'function int64_t cean_get_transf_size(CeanReadRanges*)'
diff --git a/tests/data/test-diff-filter/test41-report-0.txt b/tests/data/test-diff-filter/test41-report-0.txt
index c76cb67d..49eac055 100644
--- a/tests/data/test-diff-filter/test41-report-0.txt
+++ b/tests/data/test-diff-filter/test41-report-0.txt
@@ -40,7 +40,7 @@ Variable symbols changes summary: 0 Removed, 0 Added variable symbol not referen
     return type changed:
       type size hasn't changed
       1 data member change:
-        type of 'std::__cxx11::string* raw_' changed:
+        type of 'string* raw_' changed:
           in pointed to type 'typedef std::__cxx11::string' at stringfwd.h:74:1:
             underlying type 'class std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >' at basic_string.h:72:1 changed:
               type size hasn't changed
diff --git a/tests/data/test-diff-filter/test6-report.txt b/tests/data/test-diff-filter/test6-report.txt
index 61fb1d93..5327622d 100644
--- a/tests/data/test-diff-filter/test6-report.txt
+++ b/tests/data/test-diff-filter/test6-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo(void)' has some indirect sub-type changes:
     return type changed:
       underlying type 'unsigned char' changed:
         type name changed from 'unsigned char' to 'unsigned int'
diff --git a/tests/data/test-diff-filter/test7-report.txt b/tests/data/test-diff-filter/test7-report.txt
index 2a28163f..b1600f86 100644
--- a/tests/data/test-diff-filter/test7-report.txt
+++ b/tests/data/test-diff-filter/test7-report.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function return_type foo()' has some indirect sub-type changes:
+  [C] 'function return_type foo(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'return_type' to 'other_return_type'
       type size hasn't changed
diff --git a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
index 171d6490..fecc0ce9 100644
--- a/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg-ctf/gmp-6.x.x86_64-report-0.txt
@@ -126,8 +126,8 @@
       type of variable changed:
         type size hasn't changed
         1 data member change:
-          type of 'typedef mp_limb_t (typedef mp_srcptr, typedef mp_size_t, typedef mp_limb_t)* gcd_1' changed:
-            in pointed to type 'function type typedef mp_limb_t (typedef mp_srcptr, typedef mp_size_t, typedef mp_limb_t)':
+          type of 'mp_limb_t (* gcd_1)(mp_srcptr, mp_size_t, mp_limb_t)' changed:
+            in pointed to type 'function type typedef mp_limb_t (mp_srcptr, mp_size_t, mp_limb_t)':
               parameter 1 of type 'typedef mp_srcptr' changed:
                 typedef name changed from mp_srcptr to mp_limb_t
                 underlying type 'const mp_limb_t*' changed:
diff --git a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt b/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
index 346d100b..2bf90e76 100644
--- a/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
+++ b/tests/data/test-diff-pkg-ctf/test-rpm-report-0.txt
@@ -4,7 +4,7 @@
 
   1 Added function:
 
-    [A] 'function int dwarf_get_str_2()'    {dwarf_get_str_2}
+    [A] 'function int dwarf_get_str_2(void)'    {dwarf_get_str_2}
 
 ================ end of changes of 'libdwarf.so.1.20180129.0'===============
 
diff --git a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
index 5bc7ff2c..868e6ed1 100644
--- a/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/GtkAda-gl-2.24.2-29.fc29.x86_64--2.24.2-30.fc30.x86_64-report-0.txt
@@ -11,7 +11,7 @@
         in unqualified underlying type 'struct gl_h__gluint_vec___XUP' at gl_h.ads:57:1:
           type size hasn't changed
           1 data member change:
-            type of 'gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB* P_BOUNDS' changed:
+            type of 'gl_h__gluint_vec___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gl_h__gluint_vec___XUP::gl_h__gluint_vec___XUB' at gl_h.ads:57:1:
                 type size hasn't changed
                 2 data member changes:
@@ -27,7 +27,7 @@
         in unqualified underlying type 'struct gtk__glarea__attributes_array___XUP' at gtk-glarea.ads:48:1:
           type size hasn't changed
           1 data member change:
-            type of 'gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
+            type of 'gtk__glarea__attributes_array___XUB* P_BOUNDS' changed:
               in pointed to type 'struct gtk__glarea__attributes_array___XUP::gtk__glarea__attributes_array___XUB':
                 type size hasn't changed
                 2 data member changes:
diff --git a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
index 87c40934..6f71157b 100644
--- a/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
+++ b/tests/data/test-diff-pkg/PR24690/PR24690-report-0.txt
@@ -8,7 +8,7 @@
     [A] 'function gboolean flatpak_installation_add_remote(FlatpakInstallation*, FlatpakRemote*, gboolean, GCancellable*, GError**)'    {flatpak_installation_add_remote}
     [A] 'function FlatpakRemoteRef* flatpak_installation_fetch_remote_ref_sync_full(FlatpakInstallation*, const char*, FlatpakRefKind, const char*, const char*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_fetch_remote_ref_sync_full}
     [A] 'function GPtrArray* flatpak_installation_list_remote_refs_sync_full(FlatpakInstallation*, const char*, FlatpakQueryFlags, GCancellable*, GError**)'    {flatpak_installation_list_remote_refs_sync_full}
-    [A] 'function GType flatpak_query_flags_get_type()'    {flatpak_query_flags_get_type}
+    [A] 'function GType flatpak_query_flags_get_type(void)'    {flatpak_query_flags_get_type}
     [A] 'function char* flatpak_remote_get_comment(FlatpakRemote*)'    {flatpak_remote_get_comment}
     [A] 'function char* flatpak_remote_get_description(FlatpakRemote*)'    {flatpak_remote_get_description}
     [A] 'function char* flatpak_remote_get_filter(FlatpakRemote*)'    {flatpak_remote_get_filter}
@@ -33,11 +33,11 @@
     [C] 'struct _FlatpakTransactionClass' changed:
       type size changed from 2176 to 2240 (in bits)
       1 data member insertion:
-        'typedef gboolean (FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)* end_of_lifed_with_rebase', at offset 1408 (in bits) at flatpak-transaction.h:117:1
+        'gboolean (* end_of_lifed_with_rebase)(FlatpakTransaction*, const char*, const char*, const char*, const char*, const char**)', at offset 1408 (in bits) at flatpak-transaction.h:117:1
       4 data member changes (3 filtered):
-        'typedef gboolean (FlatpakTransaction*)* ready' offset changed from 1408 to 1472 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, typedef FlatpakTransactionRemoteReason, const char*, const char*, const char*)* add_new_remote' offset changed from 1472 to 1536 (in bits) (by +64 bits)
-        'typedef gboolean (FlatpakTransaction*, GCancellable*, GError**)* run' offset changed from 1536 to 1600 (in bits) (by +64 bits)
+        'gboolean (* ready)(FlatpakTransaction*)' offset changed from 1408 to 1472 (in bits) (by +64 bits)
+        'gboolean (* add_new_remote)(FlatpakTransaction*, FlatpakTransactionRemoteReason, const char*, const char*, const char*)' offset changed from 1472 to 1536 (in bits) (by +64 bits)
+        'gboolean (* run)(FlatpakTransaction*, GCancellable*, GError**)' offset changed from 1536 to 1600 (in bits) (by +64 bits)
         'gpointer padding[9]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
 
   6 added types unreachable from any public interface:
diff --git a/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 b/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
index ec948e26..af560426 100644
--- a/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
+++ b/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
@@ -17,11 +17,11 @@
         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
@@ -29,7 +29,7 @@
                           '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:
diff --git a/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 b/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
index b2030147..e3699d6c 100644
--- a/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
+++ b/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
@@ -6,7 +6,7 @@
 
     [A] 'function int _crypt_crypt_checksalt(const char*)'    {crypt_checksalt@@XCRYPT_4.3}
     [A] 'function char* _crypt_crypt_gensalt_rn(const char*, unsigned long int, const char*, int, char*, int)'    {xcrypt_gensalt_r@XCRYPT_2.0, aliases crypt_gensalt_r@XCRYPT_2.0, crypt_gensalt_rn@@XCRYPT_2.0}
-    [A] 'function const char* _crypt_crypt_preferred_method()'    {crypt_preferred_method@@XCRYPT_4.4}
+    [A] 'function const char* _crypt_crypt_preferred_method(void)'    {crypt_preferred_method@@XCRYPT_4.4}
     [A] 'function char* _crypt_crypt_r(const char*, const char*, crypt_data*)'    {xcrypt_r@XCRYPT_2.0, aliases crypt_r@@XCRYPT_2.0, crypt_r@GLIBC_2.2.5}
 
 ================ end of changes of 'libcrypt.so.1.1.0'===============
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
index b2d0b268..8ccc71cf 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-2.txt
@@ -35,77 +35,77 @@
                           underlying type 'struct QXLInterface' at spice.h:230:1 changed:
                             type size hasn't changed
                             15 data member changes:
-                              type of 'void (QXLInstance*, QXLWorker*)* attache_worker' changed:
+                              type of 'void (* attache_worker)(QXLInstance*, QXLWorker*)' changed:
                                 in pointed to type 'function type void (QXLInstance*, QXLWorker*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, int)* set_compression_level' changed:
+                              type of 'void (* set_compression_level)(QXLInstance*, int)' changed:
                                 in pointed to type 'function type void (QXLInstance*, int)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t)* set_mm_time' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t)':
+                              type of 'void (* set_mm_time)(QXLInstance*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, QXLDevInitInfo*)* get_init_info' changed:
+                              type of 'void (* get_init_info)(QXLInstance*, QXLDevInitInfo*)' changed:
                                 in pointed to type 'function type void (QXLInstance*, QXLDevInitInfo*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, QXLCommandExt*)* get_command' changed:
+                              type of 'int (* get_command)(QXLInstance*, QXLCommandExt*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, QXLCommandExt*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* req_cmd_notification' changed:
+                              type of 'int (* req_cmd_notification)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, struct QXLReleaseInfoExt)* release_resource' changed:
-                                in pointed to type 'function type void (QXLInstance*, struct QXLReleaseInfoExt)':
+                              type of 'void (* release_resource)(QXLInstance*, QXLReleaseInfoExt)' changed:
+                                in pointed to type 'function type void (QXLInstance*, QXLReleaseInfoExt)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, QXLCommandExt*)* get_cursor_command' changed:
+                              type of 'int (* get_cursor_command)(QXLInstance*, QXLCommandExt*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, QXLCommandExt*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* req_cursor_notification' changed:
+                              type of 'int (* req_cursor_notification)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t)* notify_update' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t)':
+                              type of 'void (* notify_update)(QXLInstance*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*)* flush_resources' changed:
+                              type of 'int (* flush_resources)(QXLInstance*)' changed:
                                 in pointed to type 'function type int (QXLInstance*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint64_t)* async_complete' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint64_t)':
+                              type of 'void (* async_complete)(QXLInstance*, uint64_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint64_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint32_t, QXLRect*, typedef uint32_t)* update_area_complete' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint32_t, QXLRect*, typedef uint32_t)':
+                              type of 'void (* update_area_complete)(QXLInstance*, uint32_t, QXLRect*, uint32_t)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint32_t, QXLRect*, uint32_t)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'void (QXLInstance*, typedef uint8_t, uint8_t*)* set_client_capabilities' changed:
-                                in pointed to type 'function type void (QXLInstance*, typedef uint8_t, uint8_t*)':
+                              type of 'void (* set_client_capabilities)(QXLInstance*, uint8_t, uint8_t*)' changed:
+                                in pointed to type 'function type void (QXLInstance*, uint8_t, uint8_t*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
                                       underlying type 'struct QXLInstance' changed, as being reported
-                              type of 'int (QXLInstance*, VDAgentMonitorsConfig*)* client_monitors_config' changed:
+                              type of 'int (* client_monitors_config)(QXLInstance*, VDAgentMonitorsConfig*)' changed:
                                 in pointed to type 'function type int (QXLInstance*, VDAgentMonitorsConfig*)':
                                   parameter 1 of type 'QXLInstance*' has sub-type changes:
                                     in pointed to type 'typedef QXLInstance' at spice-qxl.h:34:1:
@@ -128,8 +128,8 @@
                                       underlying type 'struct SpiceCoreInterface' at spice.h:82:1 changed:
                                         type size hasn't changed
                                         3 data member changes:
-                                          type of 'SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)* watch_add' changed:
-                                            in pointed to type 'function type SpiceWatch* (int, int, typedef SpiceWatchFunc, void*)':
+                                          type of 'SpiceWatch* (* watch_add)(int, int, SpiceWatchFunc, void*)' changed:
+                                            in pointed to type 'function type SpiceWatch* (int, int, SpiceWatchFunc, void*)':
                                               return type changed:
                                                 in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                   underlying type 'struct SpiceWatch' at red_worker.c:268:1 changed:
@@ -165,7 +165,7 @@
                                                                                     type size hasn't changed
                                                                                     10 data member changes:
                                                                                       type of 'channel_configure_socket_proc config_socket' changed:
-                                                                                        underlying type 'int (RedChannelClient*)*' changed:
+                                                                                        underlying type 'int (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type int (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               in pointed to type 'typedef RedChannelClient' at red_channel.h:131:1:
@@ -194,9 +194,9 @@
                                                                                                           5 data member deletions:
                                                                                                             'RedsSASL sasl', at offset 256 (in bits) at reds.h:78:1
                                                                                                             'SpiceChannelEventInfo* info', at offset 1024 (in bits) at reds.h:85:1
-                                                                                                            'typedef ssize_t (RedsStream*, void*, typedef size_t)* read', at offset 1088 (in bits) at reds.h:88:1
-                                                                                                            'typedef ssize_t (RedsStream*, void*, typedef size_t)* write', at offset 1152 (in bits) at reds.h:89:1
-                                                                                                            'typedef ssize_t (RedsStream*, const iovec*, int)* writev', at offset 1216 (in bits) at reds.h:90:1
+                                                                                                            'ssize_t (* read)(RedsStream*, void*, size_t)', at offset 1088 (in bits) at reds.h:88:1
+                                                                                                            'ssize_t (* write)(RedsStream*, void*, size_t)', at offset 1152 (in bits) at reds.h:89:1
+                                                                                                            'ssize_t (* writev)(RedsStream*, const iovec*, int)', at offset 1216 (in bits) at reds.h:90:1
                                                                                                           2 data member changes:
                                                                                                             type of 'SSL* ssl' changed:
                                                                                                               in pointed to type 'typedef SSL' at reds_stream.h:32:1:
@@ -213,7 +213,7 @@
                                                                                                                     'BIO* bbio', at offset 256 (in bits) at ssl.h:1082:1
                                                                                                                     'int rwstate', at offset 320 (in bits) at ssl.h:1093:1
                                                                                                                     'int in_handshake', at offset 352 (in bits) at ssl.h:1096:1
-                                                                                                                    'int (SSL*)* handshake_func', at offset 384 (in bits) at ssl.h:1097:1
+                                                                                                                    'int (* handshake_func)(SSL*)', at offset 384 (in bits) at ssl.h:1097:1
                                                                                                                     'int server', at offset 448 (in bits) at ssl.h:1107:1
                                                                                                                     'int new_session', at offset 480 (in bits) at ssl.h:1109:1
                                                                                                                     'int quiet_shutdown', at offset 512 (in bits) at ssl.h:1113:1
@@ -230,7 +230,7 @@
                                                                                                                     'ssl3_state_st* s3', at offset 1024 (in bits) at ssl.h:1129:1
                                                                                                                     'dtls1_state_st* d1', at offset 1088 (in bits) at ssl.h:1130:1
                                                                                                                     'int read_ahead', at offset 1152 (in bits) at ssl.h:1132:1
-                                                                                                                    'void (int, int, int, void*, typedef size_t, SSL*, void*)* msg_callback', at offset 1216 (in bits) at ssl.h:1136:1
+                                                                                                                    'void (* msg_callback)(int, int, int, void*, size_t, SSL*, void*)', at offset 1216 (in bits) at ssl.h:1136:1
                                                                                                                     'void* msg_callback_arg', at offset 1280 (in bits) at ssl.h:1137:1
                                                                                                                     'int hit', at offset 1344 (in bits) at ssl.h:1139:1
                                                                                                                     'X509_VERIFY_PARAM* param', at offset 1408 (in bits) at ssl.h:1141:1
@@ -249,13 +249,13 @@
                                                                                                                     'SSL_SESSION* session', at offset 2432 (in bits) at ssl.h:1183:1
                                                                                                                     'GEN_SESSION_CB generate_session_id', at offset 2496 (in bits) at ssl.h:1186:1
                                                                                                                     'int verify_mode', at offset 2560 (in bits) at ssl.h:1189:1
-                                                                                                                    'int (int, X509_STORE_CTX*)* verify_callback', at offset 2624 (in bits) at ssl.h:1191:1
-                                                                                                                    'void (const SSL*, int, int)* info_callback', at offset 2688 (in bits) at ssl.h:1193:1
+                                                                                                                    'int (* verify_callback)(int, X509_STORE_CTX*)', at offset 2624 (in bits) at ssl.h:1191:1
+                                                                                                                    'void (* info_callback)(const SSL*, int, int)', at offset 2688 (in bits) at ssl.h:1193:1
                                                                                                                     'int error', at offset 2752 (in bits) at ssl.h:1195:1
                                                                                                                     'int error_code', at offset 2784 (in bits) at ssl.h:1196:1
                                                                                                                     'KSSL_CTX* kssl_ctx', at offset 2816 (in bits) at ssl.h:1199:1
-                                                                                                                    'unsigned int (SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)* psk_client_callback', at offset 2880 (in bits) at ssl.h:1203:1
-                                                                                                                    'unsigned int (SSL*, const char*, unsigned char*, unsigned int)* psk_server_callback', at offset 2944 (in bits) at ssl.h:1206:1
+                                                                                                                    'unsigned int (* psk_client_callback)(SSL*, const char*, char*, unsigned int, unsigned char*, unsigned int)', at offset 2880 (in bits) at ssl.h:1203:1
+                                                                                                                    'unsigned int (* psk_server_callback)(SSL*, const char*, unsigned char*, unsigned int)', at offset 2944 (in bits) at ssl.h:1206:1
                                                                                                                     'SSL_CTX* ctx', at offset 3008 (in bits) at ssl.h:1210:1
                                                                                                                     'int debug', at offset 3072 (in bits) at ssl.h:1213:1
                                                                                                                     'long int verify_result', at offset 3136 (in bits) at ssl.h:1216:1
@@ -268,7 +268,7 @@
                                                                                                                     'int first_packet', at offset 3648 (in bits) at ssl.h:1226:1
                                                                                                                     'int client_version', at offset 3680 (in bits) at ssl.h:1227:1
                                                                                                                     'unsigned int max_send_fragment', at offset 3712 (in bits) at ssl.h:1229:1
-                                                                                                                    'void (SSL*, int, int, unsigned char*, int, void*)* tlsext_debug_cb', at offset 3776 (in bits) at ssl.h:1232:1
+                                                                                                                    'void (* tlsext_debug_cb)(SSL*, int, int, unsigned char*, int, void*)', at offset 3776 (in bits) at ssl.h:1232:1
                                                                                                                     'void* tlsext_debug_arg', at offset 3840 (in bits) at ssl.h:1235:1
                                                                                                                     'char* tlsext_hostname', at offset 3904 (in bits) at ssl.h:1236:1
                                                                                                                     'int servername_done', at offset 3968 (in bits) at ssl.h:1237:1
@@ -304,48 +304,48 @@
                                                                                                               in pointed to type 'typedef SpiceWatch' at spice-core.h:68:1:
                                                                                                                 underlying type 'struct SpiceWatch' changed, as being reported
                                                                                       type of 'channel_disconnect_proc on_disconnect' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_send_pipe_item_proc send_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_hold_pipe_item_proc hold_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_release_pipe_item_proc release_item' changed:
-                                                                                        underlying type 'void (RedChannelClient*, PipeItem*, int)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*, PipeItem*, int)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*, PipeItem*, int)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_alloc_msg_recv_buf_proc alloc_recv_buf' changed:
-                                                                                        underlying type 'uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)*' changed:
-                                                                                          in pointed to type 'function type uint8_t* (RedChannelClient*, typedef uint16_t, typedef uint32_t)':
+                                                                                        underlying type 'uint8_t* (*)(RedChannelClient*, uint16_t, uint32_t)' changed:
+                                                                                          in pointed to type 'function type uint8_t* (RedChannelClient*, uint16_t, uint32_t)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_release_msg_recv_buf_proc release_recv_buf' changed:
-                                                                                        underlying type 'void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)*' changed:
-                                                                                          in pointed to type 'function type void (RedChannelClient*, typedef uint16_t, typedef uint32_t, uint8_t*)':
+                                                                                        underlying type 'void (*)(RedChannelClient*, uint16_t, uint32_t, uint8_t*)' changed:
+                                                                                          in pointed to type 'function type void (RedChannelClient*, uint16_t, uint32_t, uint8_t*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_flush_mark_proc handle_migrate_flush_mark' changed:
-                                                                                        underlying type 'int (RedChannelClient*)*' changed:
+                                                                                        underlying type 'int (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type int (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_data_proc handle_migrate_data' changed:
-                                                                                        underlying type 'int (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                                                                          in pointed to type 'function type int (RedChannelClient*, typedef uint32_t, void*)':
+                                                                                        underlying type 'int (*)(RedChannelClient*, uint32_t, void*)' changed:
+                                                                                          in pointed to type 'function type int (RedChannelClient*, uint32_t, void*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_handle_migrate_data_get_serial_proc handle_migrate_data_get_serial' changed:
-                                                                                        underlying type 'typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)*' changed:
-                                                                                          in pointed to type 'function type typedef uint64_t (RedChannelClient*, typedef uint32_t, void*)':
+                                                                                        underlying type 'uint64_t (*)(RedChannelClient*, uint32_t, void*)' changed:
+                                                                                          in pointed to type 'function type typedef uint64_t (RedChannelClient*, uint32_t, void*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                 type of 'ClientCbs client_cbs' changed:
@@ -353,7 +353,7 @@
                                                                                     type size hasn't changed
                                                                                     3 data member changes:
                                                                                       type of 'channel_client_connect_proc connect' changed:
-                                                                                        underlying type 'void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)' changed:
                                                                                           in pointed to type 'function type void (RedChannel*, RedClient*, RedsStream*, int, int, uint32_t*, int, uint32_t*)':
                                                                                             parameter 1 of type 'RedChannel*' has sub-type changes:
                                                                                               in pointed to type 'typedef RedChannel' at red_channel.h:130:1:
@@ -363,12 +363,12 @@
                                                                                             parameter 3 of type 'RedsStream*' has sub-type changes:
                                                                                               pointed to type 'typedef RedsStream' changed at red_channel.h:134:1, as reported earlier
                                                                                       type of 'channel_client_disconnect_proc disconnect' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                                                                       type of 'channel_client_migrate_proc migrate' changed:
-                                                                                        underlying type 'void (RedChannelClient*)*' changed:
+                                                                                        underlying type 'void (*)(RedChannelClient*)' changed:
                                                                                           in pointed to type 'function type void (RedChannelClient*)':
                                                                                             parameter 1 of type 'RedChannelClient*' has sub-type changes:
                                                                                               pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
@@ -575,11 +575,11 @@
                                                             'uint64_t* command_counter' offset changed from 15520064 to 14876800 (in bits) (by -643264 bits)
                                                             'int driver_cap_monitors_config' offset changed from 15520128 to 14876864 (in bits) (by -643264 bits)
                                                             'int set_client_capabilities_pending' offset changed from 15520160 to 14876896 (in bits) (by -643264 bits)
-                                          type of 'void (SpiceWatch*, int)* watch_update_mask' changed:
+                                          type of 'void (* watch_update_mask)(SpiceWatch*, int)' changed:
                                             in pointed to type 'function type void (SpiceWatch*, int)':
                                               parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
-                                          type of 'void (SpiceWatch*)* watch_remove' changed:
+                                          type of 'void (* watch_remove)(SpiceWatch*)' changed:
                                             in pointed to type 'function type void (SpiceWatch*)':
                                               parameter 1 of type 'SpiceWatch*' has sub-type changes:
                                                 pointed to type 'typedef SpiceWatch' changed at spice.h:61:1, as reported earlier
@@ -744,19 +744,19 @@
                               underlying type 'struct SpiceCharDeviceCallbacks' at char_device.h:81:1 changed:
                                 type size hasn't changed
                                 4 data member changes:
-                                  type of 'SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)* read_one_msg_from_device' changed:
+                                  type of 'SpiceCharDeviceMsgToClient* (* read_one_msg_from_device)(SpiceCharDeviceInstance*, void*)' changed:
                                     in pointed to type 'function type SpiceCharDeviceMsgToClient* (SpiceCharDeviceInstance*, void*)':
                                       parameter 1 of type 'SpiceCharDeviceInstance*' has sub-type changes:
                                         pointed to type 'typedef SpiceCharDeviceInstance' changed at spice.h:399:1, as reported earlier
-                                  type of 'void (SpiceCharDeviceMsgToClient*, RedClient*, void*)* send_msg_to_client' changed:
+                                  type of 'void (* send_msg_to_client)(SpiceCharDeviceMsgToClient*, RedClient*, void*)' changed:
                                     in pointed to type 'function type void (SpiceCharDeviceMsgToClient*, RedClient*, void*)':
                                       parameter 2 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, typedef uint32_t, void*)* send_tokens_to_client' changed:
-                                    in pointed to type 'function type void (RedClient*, typedef uint32_t, void*)':
+                                  type of 'void (* send_tokens_to_client)(RedClient*, uint32_t, void*)' changed:
+                                    in pointed to type 'function type void (RedClient*, uint32_t, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
-                                  type of 'void (RedClient*, void*)* remove_client' changed:
+                                  type of 'void (* remove_client)(RedClient*, void*)' changed:
                                     in pointed to type 'function type void (RedClient*, void*)':
                                       parameter 1 of type 'RedClient*' has sub-type changes:
                                         pointed to type 'typedef RedClient' changed at red_channel.h:137:1, as reported earlier
@@ -846,7 +846,7 @@
       parameter 1 of type 'SpiceServer*' has sub-type changes:
         pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as reported earlier
 
-    [C] 'function SpiceServer* spice_server_new()' at reds.c:4089:1 has some indirect sub-type changes:
+    [C] 'function SpiceServer* spice_server_new(void)' at reds.c:4089:1 has some indirect sub-type changes:
       return type changed:
         pointed to type 'typedef SpiceServer' changed at spice.h:440:1, as reported earlier
 
@@ -881,19 +881,19 @@
                                   type of 'RedChannelClient* channel_client' changed:
                                     pointed to type 'typedef RedChannelClient' changed at red_channel.h:136:1, as reported earlier
                                   type of 'snd_channel_handle_message_proc handle_message' changed:
-                                    underlying type 'int (SndChannel*, typedef size_t, typedef uint32_t, void*)*' changed:
-                                      in pointed to type 'function type int (SndChannel*, typedef size_t, typedef uint32_t, void*)':
+                                    underlying type 'int (*)(SndChannel*, size_t, uint32_t, void*)' changed:
+                                      in pointed to type 'function type int (SndChannel*, size_t, uint32_t, void*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
                                   type of 'snd_channel_on_message_done_proc on_message_done' changed:
-                                    underlying type 'void (SndChannel*)*' changed:
+                                    underlying type 'void (*)(SndChannel*)' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
                                             underlying type 'struct SndChannel' changed, as being reported
                                   type of 'snd_channel_cleanup_channel_proc cleanup' changed:
-                                    underlying type 'void (SndChannel*)*' changed:
+                                    underlying type 'void (*)(SndChannel*)' changed:
                                       in pointed to type 'function type void (SndChannel*)':
                                         parameter 1 of type 'SndChannel*' has sub-type changes:
                                           in pointed to type 'typedef SndChannel' at snd_worker.c:74:1:
diff --git a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
index 2afe14f8..2d2cbb93 100644
--- a/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
+++ b/tests/data/test-diff-pkg/spice-server-0.12.4-19.el7.x86_64-0.12.8-1.el7.x86_64-report-3.txt
@@ -83,7 +83,7 @@ Leaf changes summary: 10 artifacts changed (13 filtered out)
       function int spice_server_migrate_info(SpiceServer*, const char*, int, int, const char*)
       function int spice_server_migrate_start(SpiceServer*)
       function int spice_server_migrate_switch(SpiceServer*)
-      function SpiceServer* spice_server_new()
+      function SpiceServer* spice_server_new(void)
       function void spice_server_playback_get_buffer(SpicePlaybackInstance*, uint32_t**, uint32_t*)
       function void spice_server_playback_put_samples(SpicePlaybackInstance*, uint32_t*)
       function void spice_server_playback_set_mute(SpicePlaybackInstance*, uint8_t)
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
index 28cf8588..f6cf99e5 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-0.txt
@@ -6,7 +6,7 @@
 
   17 Added functions:
 
-    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot(void)'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
@@ -32,7 +32,7 @@
           type size hasn't changed
           no member function changes (4 filtered);
           1 data member changes (4 filtered):
-            type of 'tbb::internal::input_buffer* my_input_buffer' changed:
+            type of 'input_buffer* my_input_buffer' changed:
               in pointed to type 'class tbb::internal::input_buffer' at pipeline.cpp:52:1:
                 type size hasn't changed
                 1 data member change:
@@ -47,7 +47,7 @@
           in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
             type size hasn't changed
             1 data member change:
-              type of 'tbb::task_group_context& my_context' changed:
+              type of 'task_group_context& my_context' changed:
                 in referenced type 'class tbb::task_group_context' at task.h:302:1:
                   type size hasn't changed
                   1 data member insertion:
@@ -57,7 +57,7 @@
                       type name changed from 'char[80]' to 'char[72]'
                       array type size changed from 640 to 576
                       array type subrange 1 changed length from 80 to 72
-                    type of 'tbb::internal::generic_scheduler* my_owner' changed:
+                    type of 'generic_scheduler* my_owner' changed:
                       in pointed to type 'class tbb::internal::generic_scheduler' at scheduler.h:110:1:
                         type size changed from 3136 to 3072 (in bits)
                         1 base class change:
@@ -67,7 +67,7 @@
                               'volatile intptr_t* my_ref_top_priority', at offset 576 (in bits) at scheduler.h:96:1
                               'volatile uintptr_t* my_ref_reload_epoch', at offset 640 (in bits) at scheduler.h:99:1
                             3 data member changes (2 filtered):
-                              type of 'tbb::internal::arena_slot* my_arena_slot' changed:
+                              type of 'arena_slot* my_arena_slot' changed:
                                 in pointed to type 'struct tbb::internal::arena_slot' at scheduler_common.h:316:1:
                                   type size hasn't changed
                                   2 base class deletions:
@@ -76,7 +76,7 @@
                                   2 base class insertions:
                                     struct tbb::internal::padded<tbb::internal::arena_slot_line1, 128ul> at tbb_stddef.h:251:1
                                     struct tbb::internal::padded<tbb::internal::arena_slot_line2, 128ul> at tbb_stddef.h:251:1
-                              type of 'tbb::internal::arena* my_arena' changed:
+                              type of 'arena* my_arena' changed:
                                 in pointed to type 'class tbb::internal::arena' at arena.h:160:1:
                                   type size hasn't changed
                                   1 base class deletion:
@@ -87,7 +87,7 @@
                               type of 'tbb::internal::mail_inbox my_inbox' changed:
                                 type size hasn't changed
                                 1 data member change:
-                                  type of 'tbb::internal::mail_outbox* my_putter' changed:
+                                  type of 'mail_outbox* my_putter' changed:
                                     in pointed to type 'class tbb::internal::mail_outbox' at mailbox.h:103:1:
                                       type size hasn't changed
                                       1 base class deletion:
@@ -107,7 +107,7 @@
                           'volatile uintptr_t* my_ref_reload_epoch', at offset 2752 (in bits) at scheduler.h:443:1
                         18 data member changes:
                           'uintptr_t my_stealing_threshold' offset changed from 704 to 832 (in bits) (by +128 bits)
-                          type of 'tbb::internal::market* my_market' changed:
+                          type of 'market* my_market' changed:
                             in pointed to type 'class tbb::internal::market' at market.h:49:1:
                               type size changed from 1664 to 1728 (in bits)
                               no member function changes (8 filtered);
@@ -134,7 +134,7 @@
                                 'intptr_t my_global_top_priority' offset changed from 384 to 448 (in bits) (by +64 bits)
                                 'intptr_t my_global_bottom_priority' offset changed from 448 to 512 (in bits) (by +64 bits)
                                 'uintptr_t my_global_reload_epoch' offset changed from 512 to 576 (in bits) (by +64 bits)
-                                type of 'tbb::internal::market::priority_level_info my_priority_levels[3]' changed:
+                                type of 'priority_level_info my_priority_levels[3]' changed:
                                   array element type 'struct tbb::internal::market::priority_level_info' changed:
                                     type size hasn't changed
                                     1 data member change:
@@ -144,15 +144,15 @@
                                   type size hasn't changed
                                 and offset changed from 576 to 640 (in bits) (by +64 bits)
                                 'uintptr_t my_arenas_aba_epoch' offset changed from 1536 to 1600 (in bits) (by +64 bits)
-                                'tbb::internal::generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
+                                'generic_scheduler* my_workers[1]' offset changed from 1600 to 1664 (in bits) (by +64 bits)
                           and offset changed from 768 to 896 (in bits) (by +128 bits)
                           'tbb::internal::FastRandom my_random' offset changed from 832 to 960 (in bits) (by +128 bits)
-                          'tbb::task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
-                          'tbb::task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
+                          'task* my_free_list' offset changed from 960 to 1024 (in bits) (by +64 bits)
+                          'task* my_dummy_task' offset changed from 1024 to 1088 (in bits) (by +64 bits)
                           'long int my_ref_count' offset changed from 1088 to 1152 (in bits) (by +64 bits)
                           'bool my_auto_initialized' offset changed from 1152 to 1216 (in bits) (by +64 bits)
                           'intptr_t my_small_task_count' offset changed from 1216 to 1280 (in bits) (by +64 bits)
-                          'tbb::task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
+                          'task* my_return_list' offset changed from 1280 to 1344 (in bits) (by +64 bits)
                           'char _padding1[112]' offset changed from 1344 to 1408 (in bits) (by +64 bits)
                           'tbb::internal::context_list_node_t my_context_list_head' offset changed from 2240 to 2304 (in bits) (by +64 bits)
                           'tbb::spin_mutex my_context_list_mutex' offset changed from 2368 to 2432 (in bits) (by +64 bits)
@@ -169,7 +169,7 @@
           type size hasn't changed
           no member function changes (7 filtered);
           1 data member change:
-            type of 'tbb::internal::concurrent_queue_rep* my_rep' changed:
+            type of 'concurrent_queue_rep* my_rep' changed:
               in pointed to type 'class tbb::internal::concurrent_queue_rep' at concurrent_queue.cpp:129:1:
                 type size hasn't changed
                 1 data member changes (2 filtered):
@@ -258,8 +258,8 @@
     [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
     [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
     [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void safer_scalable_free(void*, void (*)(void*))'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))'    {safer_scalable_msize}
     [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
index 675d766d..c159479e 100644
--- a/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
+++ b/tests/data/test-diff-pkg/tbb-4.1-9.20130314.fc22.x86_64--tbb-4.3-3.20141204.fc23.x86_64-report-1.txt
@@ -6,7 +6,7 @@
 
   17 Added functions:
 
-    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot()'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
+    [A] 'method int tbb::interface7::internal::task_arena_base::internal_current_slot(void)'    {_ZN3tbb10interface78internal15task_arena_base21internal_current_slotEv}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_enqueue(tbb::task&, intptr_t) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_enqueueERNS_4taskEl}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_execute(tbb::interface7::internal::delegate_base&) const'    {_ZNK3tbb10interface78internal15task_arena_base16internal_executeERNS1_13delegate_baseE}
     [A] 'method void tbb::interface7::internal::task_arena_base::internal_initialize()'    {_ZN3tbb10interface78internal15task_arena_base19internal_initializeEv}
@@ -32,7 +32,7 @@
           in unqualified underlying type 'class tbb::internal::allocate_root_with_context_proxy' at task.h:131:1:
             type size hasn't changed
             1 data member change:
-              type of 'tbb::task_group_context& my_context' changed:
+              type of 'task_group_context& my_context' changed:
                 in referenced type 'class tbb::task_group_context' at task.h:302:1:
                   type size hasn't changed
                   1 data member insertion:
@@ -116,8 +116,8 @@
     [D] 'function int rml::internal::__TBB_internal_posix_memalign(void**, size_t, size_t)'    {__TBB_internal_posix_memalign}
     [D] 'function void* rml::internal::__TBB_internal_realloc(void*, size_t)'    {__TBB_internal_realloc}
     [D] 'function void* safer_scalable_aligned_realloc(void*, size_t, size_t, void*)'    {safer_scalable_aligned_realloc}
-    [D] 'function void safer_scalable_free(void*, void (void*)*)'    {safer_scalable_free}
-    [D] 'function size_t safer_scalable_msize(void*, typedef size_t (void*)*)'    {safer_scalable_msize}
+    [D] 'function void safer_scalable_free(void*, void (*)(void*))'    {safer_scalable_free}
+    [D] 'function size_t safer_scalable_msize(void*, size_t (*)(void*))'    {safer_scalable_msize}
     [D] 'function void* safer_scalable_realloc(void*, size_t, void*)'    {safer_scalable_realloc}
 
   27 Added function symbols not referenced by debug info:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-0.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-3.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-5.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
index 35b2c40a..3fb29aff 100644
--- a/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
+++ b/tests/data/test-diff-suppr/test0-type-suppr-report-7.txt
@@ -8,7 +8,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'struct MyType':
         type size hasn't changed
         1 data member change:
-          type of 'MyType::Private* priv' changed:
+          type of 'Private* priv' changed:
             in pointed to type 'struct MyType::Private':
               type size changed from 32 to 64 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
index 3f9c6fc7..8449e480 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
index 0ab050b2..771dc639 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
index 3f9c6fc7..8449e480 100644
--- a/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test15-suppr-added-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv}
+  [A] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
index 59592e3d..4fed710a 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-0.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
index 4d7d51cd..ca83ecdc 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
diff --git a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
index 59592e3d..4fed710a 100644
--- a/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
+++ b/tests/data/test-diff-suppr/test16-suppr-removed-fn-report-5.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void bar()'    {_Z3barv}
+  [D] 'function void bar(void)'    {_Z3barv}
 
 1 function with some indirect sub-type change:
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-3.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
index ecb6d981..b99e4acf 100644
--- a/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test27-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {_Z3barv, aliases _Z3bazv}
+  [A] 'function void bar(void)'    {_Z3barv, aliases _Z3bazv}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-0.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-1.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-2.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-4.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
index 853dd162..05b0c79d 100644
--- a/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
+++ b/tests/data/test-diff-suppr/test28-add-aliased-function-report-5.txt
@@ -3,5 +3,5 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 Added function:
 
-  [A] 'function void bar()'    {bar, aliases baz}
+  [A] 'function void bar(void)'    {bar, aliases baz}
 
diff --git a/tests/data/test-diff-suppr/test30-report-0.txt b/tests/data/test-diff-suppr/test30-report-0.txt
index e273d013..dff96302 100644
--- a/tests/data/test-diff-suppr/test30-report-0.txt
+++ b/tests/data/test-diff-suppr/test30-report-0.txt
@@ -22,7 +22,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
       in pointed to type 'class S' at test30-pub-lib-v1.h:1:1:
         type size hasn't changed
         1 data member change:
-          type of 'S::priv_type* priv' changed:
+          type of 'priv_type* priv' changed:
             in pointed to type 'class S::priv_type' at test30-pub-lib-v1.cc:14:1:
               type size changed from 64 to 128 (in bits)
               1 data member insertion:
diff --git a/tests/data/test-diff-suppr/test32-report-0.txt b/tests/data/test-diff-suppr/test32-report-0.txt
index 2489b56d..c1adfb95 100644
--- a/tests/data/test-diff-suppr/test32-report-0.txt
+++ b/tests/data/test-diff-suppr/test32-report-0.txt
@@ -3,12 +3,12 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 2 functions with some indirect sub-type change:
 
-  [C] 'function void priv::foo()' has some indirect sub-type changes:
+  [C] 'function void priv::foo(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'int'
       type size changed from 0 to 32 (in bits)
 
-  [C] 'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test32-report-1.txt b/tests/data/test-diff-suppr/test32-report-1.txt
index cffdf3a5..e416a088 100644
--- a/tests/data/test-diff-suppr/test32-report-1.txt
+++ b/tests/data/test-diff-suppr/test32-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
 1 function with some indirect sub-type change:
 
-  [C] 'function void pub::bar()' has some indirect sub-type changes:
+  [C] 'function void pub::bar(void)' has some indirect sub-type changes:
     return type changed:
       type name changed from 'void' to 'char'
       type size changed from 0 to 8 (in bits)
diff --git a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
index 1b49d600..6dc832ac 100644
--- a/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
+++ b/tests/data/test-diff-suppr/test44-suppr-sym-name-not-regexp-report-1.txt
@@ -3,7 +3,7 @@ Variables changes summary: 1 Removed, 0 Changed, 0 Added variable
 
 1 Removed function:
 
-  [D] 'function void test2()'    {test2}
+  [D] 'function void test2(void)'    {test2}
 
 1 Removed variable:
 
diff --git a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
index 8e6fdd4e..de2c4e6b 100644
--- a/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
+++ b/tests/data/test-fedabipkgdiff/vte291-0.39.1-1.fc22.x86_64--vte291-0.39.90-1.fc22.x86_64-report-0.txt
@@ -6,7 +6,7 @@ Comparing the ABI of binaries between vte291-0.39.1-1.fc22.x86_64.rpm and vte291
 
   3 Added functions:
 
-    [A] 'function const char* vte_get_features()'    {vte_get_features}
+    [A] 'function const char* vte_get_features(void)'    {vte_get_features}
     [A] 'function const char* vte_terminal_get_word_char_exceptions(VteTerminal*)'    {vte_terminal_get_word_char_exceptions}
     [A] 'function void vte_terminal_set_word_char_exceptions(VteTerminal*, const char*)'    {vte_terminal_set_word_char_exceptions}
 
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi
index 7f1e861b..a1def56f 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -16,11 +16,11 @@
       <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-11'/>
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-12'/>
-    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='256' alignment-in-bits='64' id='type-id-14'>
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-15'/>
+    <array-type-def dimensions='1' type-id='type-id-13' size-in-bits='640' alignment-in-bits='64' id='type-id-14'>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-15'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='640' alignment-in-bits='64' id='type-id-17'>
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-18'/>
+    <array-type-def dimensions='1' type-id='type-id-16' size-in-bits='256' alignment-in-bits='64' id='type-id-17'>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-18'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-12' size-in-bits='160' id='type-id-19'>
       <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-10'/>
@@ -36,7 +36,7 @@
         <var-decl name='c' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='d' type-id='type-id-17' visibility='default'/>
+        <var-decl name='d' type-id='type-id-14' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='e' type-id='type-id-6' visibility='default'/>
@@ -45,8 +45,8 @@
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-4'/>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' alignment-in-bits='64' id='type-id-21'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' alignment-in-bits='64' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-12' size-in-bits='64' alignment-in-bits='64' id='type-id-13'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' alignment-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-12' size-in-bits='64' alignment-in-bits='64' id='type-id-16'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' alignment-in-bits='64' id='type-id-13'/>
     <function-decl name='foo' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='foo'>
       <parameter type-id='type-id-21'/>
       <return type-id='type-id-12'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 501658df..678c67f0 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -335,22 +335,22 @@
     <qualified-type-def type-id='type-id-82' restrict='yes' id='type-id-83'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-84'/>
     <qualified-type-def type-id='type-id-84' restrict='yes' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-87'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-88'/>
-    <qualified-type-def type-id='type-id-88' restrict='yes' id='type-id-89'/>
-    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-28'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-92'/>
-    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-93'/>
-    <qualified-type-def type-id='type-id-93' restrict='yes' id='type-id-94'/>
-    <reference-type-def kind='lvalue' type-id='type-id-95' size-in-bits='64' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-97'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-98'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
-    <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-87'/>
+    <qualified-type-def type-id='type-id-87' restrict='yes' id='type-id-88'/>
+    <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-28'/>
+    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-91'/>
+    <pointer-type-def type-id='type-id-37' size-in-bits='64' id='type-id-92'/>
+    <qualified-type-def type-id='type-id-92' restrict='yes' id='type-id-93'/>
+    <reference-type-def kind='lvalue' type-id='type-id-94' size-in-bits='64' id='type-id-95'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-96'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-97'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-106'/>
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-107'/>
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
     <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-110'/>
@@ -412,7 +412,7 @@
     <qualified-type-def type-id='type-id-187' restrict='yes' id='type-id-189'/>
     <namespace-decl name='std'>
       <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' id='type-id-190'/>
-      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2112' visibility='default' id='type-id-99'>
+      <class-decl name='basic_ios&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2112' visibility='default' id='type-id-98'>
         <member-function access='public'>
           <function-decl name='rdstate' mangled-name='_ZNKSt9basic_iosIcSt11char_traitsIcEE7rdstateEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-191' is-artificial='yes'/>
@@ -421,7 +421,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='setstate' mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEE8setstateESt12_Ios_Iostate' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <parameter type-id='type-id-192'/>
             <return type-id='type-id-193'/>
           </function-decl>
@@ -440,104 +440,104 @@
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ios' mangled-name='_ZNSt9basic_iosIcSt11char_traitsIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_ios.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-100' is-artificial='yes'/>
+            <parameter type-id='type-id-99' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' id='type-id-101'>
+      <class-decl name='basic_iostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2304' visibility='default' id='type-id-100'>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_iostream' mangled-name='_ZNSdD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-102' is-artificial='yes'/>
+            <parameter type-id='type-id-101' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' id='type-id-103'>
+      <class-decl name='basic_istream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2240' visibility='default' id='type-id-102'>
         <member-function access='public'>
           <function-decl name='gcount' mangled-name='_ZNKSi6gcountEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-194' is-artificial='yes'/>
@@ -546,99 +546,99 @@
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_istream' mangled-name='_ZNSiD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/istream' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-104' is-artificial='yes'/>
+            <parameter type-id='type-id-103' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_streambuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default' id='type-id-105'>
+      <class-decl name='basic_streambuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='512' visibility='default' id='type-id-104'>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_streambuf' mangled-name='_ZNSt15basic_streambufIcSt11char_traitsIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/streambuf' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-106' is-artificial='yes'/>
+            <parameter type-id='type-id-105' is-artificial='yes'/>
             <return type-id='type-id-193'/>
           </function-decl>
         </member-function>
@@ -809,7 +809,7 @@
       </class-decl>
       <class-decl name='__anonymous_struct__9' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-211'>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-190' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-95'/>
+          <typedef-decl name='allocator_type' type-id='type-id-190' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='445' column='1' id='type-id-94'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_pointer' type-id='type-id-60' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='453' column='1' id='type-id-212'/>
@@ -819,7 +819,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -887,7 +887,7 @@
           </member-type>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -911,7 +911,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_dispose' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -923,14 +923,14 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_destroy' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_M_destroyEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -948,13 +948,13 @@
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -966,14 +966,14 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='assign' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6assignERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1093' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
@@ -986,32 +986,32 @@
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-222'/>
               <return type-id='type-id-193'/>
@@ -1019,7 +1019,7 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EPKcmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-222'/>
@@ -1028,34 +1028,34 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_local_data' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_local_dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-216'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_length' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE9_M_lengthEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_set_length' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE13_M_set_lengthEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_St20forward_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-232'/>
@@ -1064,7 +1064,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct_aux&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPcEEvT_S7_St12__false_type' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-233'/>
@@ -1073,7 +1073,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPcEEvT_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-55'/>
               <parameter type-id='type-id-55'/>
               <return type-id='type-id-193'/>
@@ -1081,14 +1081,14 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_data' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7_M_dataEPc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-216'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_capacity' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE11_M_capacityEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-193'/>
             </function-decl>
@@ -1111,14 +1111,14 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='587' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_St20forward_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-232'/>
@@ -1127,7 +1127,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct_aux&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE16_M_construct_auxIPKcEEvT_S8_St12__false_type' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-233'/>
@@ -1136,7 +1136,7 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_construct&lt;const char *&gt;' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12_M_constructIPKcEEvT_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-193'/>
@@ -1152,21 +1152,21 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='982' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator+=' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEpLERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='941' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1024' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-230'/>
             </function-decl>
@@ -1182,19 +1182,19 @@
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='append' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6appendEPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <return type-id='type-id-230'/>
@@ -1202,19 +1202,19 @@
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-222'/>
               <return type-id='type-id-193'/>
@@ -1222,26 +1222,26 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-229'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-60'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-222'/>
@@ -1250,7 +1250,7 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_string' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-231'/>
               <return type-id='type-id-193'/>
             </function-decl>
@@ -1265,7 +1265,7 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='replace' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE7replaceEmmPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1578' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
@@ -1275,7 +1275,7 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='insert' mangled-name='_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE6insertEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.h' line='1392' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-97' is-artificial='yes'/>
+              <parameter type-id='type-id-96' is-artificial='yes'/>
               <parameter type-id='type-id-218'/>
               <parameter type-id='type-id-60'/>
               <return type-id='type-id-230'/>
@@ -1295,49 +1295,49 @@
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' mangled-name='_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~basic_stringstream' mangled-name='_ZNSt7__cxx1118basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/sstream' line='717' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-98' is-artificial='yes'/>
+              <parameter type-id='type-id-97' is-artificial='yes'/>
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
@@ -1485,7 +1485,7 @@
       <return type-id='type-id-55'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-92'/>
+      <return type-id='type-id-91'/>
     </function-decl>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-60'/>
@@ -1554,13 +1554,13 @@
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vsprintf' filepath='/usr/include/stdio.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1574,7 +1574,7 @@
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1597,18 +1597,18 @@
     <function-decl name='vfscanf' filepath='/usr/include/stdio.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vscanf' filepath='/usr/include/stdio.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vsscanf' filepath='/usr/include/stdio.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fgetc' filepath='/usr/include/stdio.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1679,7 +1679,7 @@
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-89'/>
+      <parameter type-id='type-id-88'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2111,13 +2111,13 @@
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2131,21 +2131,21 @@
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-63'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='417' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-56'/>
       <parameter type-id='type-id-85'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-93'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2213,19 +2213,19 @@
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-111'/>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2248,18 +2248,18 @@
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-54'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-83'/>
       <parameter type-id='type-id-83'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2467,7 +2467,7 @@
     </function-decl>
     <function-decl name='frexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='ldexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2485,7 +2485,7 @@
     </function-decl>
     <function-decl name='modf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-87'/>
+      <parameter type-id='type-id-86'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='expm1' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2814,19 +2814,19 @@
     <function-decl name='remquo' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-14'/>
     </function-decl>
     <function-decl name='remquof' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-15'/>
       <parameter type-id='type-id-15'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-15'/>
     </function-decl>
     <function-decl name='remquol' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-90'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='lrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2942,7 +2942,7 @@
     </function-decl>
     <function-decl name='vprintf' filepath='/usr/include/x86_64-linux-gnu/bits/stdio.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-61'/>
-      <parameter type-id='type-id-86'/>
+      <parameter type-id='type-id-106'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='getchar' filepath='/usr/include/x86_64-linux-gnu/bits/stdio.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3412,7 +3412,7 @@
     <type-decl name='variadic parameter type' id='type-id-245'/>
     <type-decl name='void' id='type-id-193'/>
     <pointer-type-def type-id='type-id-193' id='type-id-187'/>
-    <function-type size-in-bits='64' id='type-id-90'>
+    <function-type size-in-bits='64' id='type-id-89'>
       <parameter type-id='type-id-187'/>
       <parameter type-id='type-id-187'/>
       <return type-id='type-id-16'/>
@@ -3734,7 +3734,7 @@
       <class-decl name='__anonymous_struct__10' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-414'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -4545,7 +4545,7 @@
           <class-decl name='__anonymous_struct__2' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-430'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -4599,7 +4599,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -5002,7 +5002,7 @@
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-609'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -5860,7 +5860,7 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-621'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -5906,7 +5906,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -7224,7 +7224,7 @@
       <class-decl name='__anonymous_struct__5' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-889'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -8392,14 +8392,14 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaImEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaImEE10deallocateERS0_Pmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -8489,7 +8489,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JS1_EEEvRS2_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-999'/>
             <parameter type-id='type-id-116'/>
             <return type-id='type-id-193'/>
@@ -8497,14 +8497,14 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE8allocateERS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-1041'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JRS1_EEEvRS2_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-999'/>
             <parameter type-id='type-id-115'/>
             <return type-id='type-id-193'/>
@@ -8512,7 +8512,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE10deallocateERS2_PS1_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -9047,7 +9047,7 @@
           <class-decl name='__anonymous_struct__4' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1058'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -9129,7 +9129,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -9964,7 +9964,7 @@
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1381'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -12080,9 +12080,9 @@
     <reference-type-def kind='lvalue' type-id='type-id-1455' size-in-bits='64' id='type-id-1461'/>
     <qualified-type-def type-id='type-id-1462' const='yes' id='type-id-1463'/>
     <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
-    <qualified-type-def type-id='type-id-99' const='yes' id='type-id-1465'/>
+    <qualified-type-def type-id='type-id-98' const='yes' id='type-id-1465'/>
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-191'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1466'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1466'/>
     <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-1468'/>
     <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
@@ -12409,7 +12409,7 @@
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1666'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -12417,7 +12417,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIcEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-213'/>
           </function-decl>
@@ -13479,7 +13479,7 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1689'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -13539,7 +13539,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -14242,7 +14242,7 @@
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1852'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -14829,7 +14829,7 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1863'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -14851,7 +14851,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
@@ -15399,7 +15399,7 @@
       <class-decl name='__anonymous_struct__1' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2073'>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIcEE10deallocateERS0_Pcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-213'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -15474,7 +15474,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, bool&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJbEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1086'/>
             <return type-id='type-id-193'/>
@@ -15482,7 +15482,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, long long&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJxEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1902'/>
             <return type-id='type-id-193'/>
@@ -15490,7 +15490,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, unsigned int&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJjEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-1905'/>
             <return type-id='type-id-193'/>
@@ -15498,14 +15498,14 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaImEE8allocateERS0_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-615'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaImEE10deallocateERS0_Pmm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-96'/>
+            <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-615'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-193'/>
@@ -16712,7 +16712,7 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-2092'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-91'/>
+                <parameter type-id='type-id-90'/>
                 <parameter type-id='type-id-60'/>
                 <parameter type-id='type-id-267'/>
                 <return type-id='type-id-193'/>
@@ -16850,7 +16850,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-90'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-267'/>
             <return type-id='type-id-193'/>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index 494cefea..e9ce423b 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -9177,161 +9177,169 @@
     </array-type-def>
     <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-676'/>
     <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-1072'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-375'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-515'/>
     <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1053'/>
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1050'/>
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-358'/>
     <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-840'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-1082'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-158'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-1083'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-159'/>
     <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1084'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-406'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-602'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-139'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-1092'/>
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-693'/>
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-687'/>
     <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-279'/>
     <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-21'/>
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-24'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-198'/>
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-305'/>
     <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-291'/>
     <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-705'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-1088'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-298'/>
-    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1089'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-121'/>
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-183'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1092'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-968'/>
+    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-1096'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-121'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-1098'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-183'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-968'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-629'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-901'/>
-    <qualified-type-def type-id='type-id-213' const='yes' id='type-id-1098'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-356'/>
-    <qualified-type-def type-id='type-id-230' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-1101'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-237'/>
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-260'/>
-    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-1103'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-189'/>
-    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-1104'/>
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-1105'/>
-    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-1106'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-278'/>
-    <qualified-type-def type-id='type-id-309' const='yes' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-284'/>
-    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-866'/>
-    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-1109'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-362'/>
-    <qualified-type-def type-id='type-id-369' const='yes' id='type-id-1110'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-353'/>
-    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-401'/>
-    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-1112'/>
-    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-402'/>
-    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-1113'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-1114'/>
-    <qualified-type-def type-id='type-id-451' const='yes' id='type-id-1115'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-440'/>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-1066'/>
-    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-1116'/>
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
-    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-1118'/>
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-482'/>
-    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-1119'/>
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-681'/>
-    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-493'/>
-    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1121'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1105'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-901'/>
+    <qualified-type-def type-id='type-id-213' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-356'/>
+    <qualified-type-def type-id='type-id-230' const='yes' id='type-id-1107'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-1108'/>
+    <qualified-type-def type-id='type-id-240' const='yes' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-237'/>
+    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-1110'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-260'/>
+    <qualified-type-def type-id='type-id-265' const='yes' id='type-id-1111'/>
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-189'/>
+    <qualified-type-def type-id='type-id-275' const='yes' id='type-id-1112'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-1114'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-309' const='yes' id='type-id-1115'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-284'/>
+    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-1116'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-866'/>
+    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-362'/>
+    <qualified-type-def type-id='type-id-369' const='yes' id='type-id-1118'/>
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-1119'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-401'/>
+    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-1120'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-438' const='yes' id='type-id-1121'/>
     <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-1122'/>
-    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1123'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-553'/>
-    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-1125'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1078'/>
-    <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1126'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1077'/>
-    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-1127'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-568'/>
-    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-363'/>
-    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1129'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-659'/>
-    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-1130'/>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-649'/>
-    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-1131'/>
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-1132'/>
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-1133'/>
-    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1134'/>
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
-    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-1136'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-41'/>
-    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-1137'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-867'/>
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-1139'/>
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-816'/>
-    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-1140'/>
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-865'/>
-    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-1141'/>
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-552'/>
+    <qualified-type-def type-id='type-id-451' const='yes' id='type-id-1123'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-440'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-1124'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-1125'/>
+    <qualified-type-def type-id='type-id-486' const='yes' id='type-id-1126'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-482'/>
+    <qualified-type-def type-id='type-id-491' const='yes' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-681'/>
+    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-1128'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1129'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-1130'/>
+    <qualified-type-def type-id='type-id-547' const='yes' id='type-id-1131'/>
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-553'/>
+    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-1133'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-1078'/>
+    <qualified-type-def type-id='type-id-562' const='yes' id='type-id-1134'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-1077'/>
+    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-1135'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-568'/>
+    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-1136'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-1138'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-649'/>
+    <qualified-type-def type-id='type-id-724' const='yes' id='type-id-1139'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-297'/>
+    <qualified-type-def type-id='type-id-352' const='yes' id='type-id-1140'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-1142'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-1143'/>
+    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-1144'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-41'/>
+    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-1145'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-867'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-1146'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-1147'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-816'/>
+    <qualified-type-def type-id='type-id-873' const='yes' id='type-id-1148'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-865'/>
+    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-1149'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-552'/>
     <qualified-type-def type-id='type-id-444' const='yes' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-1142'/>
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-773'/>
+    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-1150'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-773'/>
     <qualified-type-def type-id='type-id-170' const='yes' id='type-id-1074'/>
     <qualified-type-def type-id='type-id-120' const='yes' id='type-id-974'/>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1143'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-506'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-1151'/>
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-506'/>
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-1030'/>
     <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-208'/>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-1144'/>
+    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-1152'/>
     <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-396'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-452'/>
     <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-995'/>
     <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-281'/>
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-182'/>
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-286'/>
     <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-280'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1148'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1149'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1150'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-888'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-426'/>
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-1160'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-330'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1162'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-888'/>
     <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-684'/>
     <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-345'/>
     <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1156'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1164'/>
     <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-346'/>
     <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-1165'/>
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-447'/>
     <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1158'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1166'/>
     <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-411'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-413'/>
-    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1171'/>
     <pointer-type-def type-id='type-id-418' size-in-bits='64' id='type-id-220'/>
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-420'/>
     <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-421'/>
@@ -9340,178 +9348,183 @@
     <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-430'/>
     <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-427'/>
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1164'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1173'/>
     <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-69'/>
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-874'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-685'/>
-    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-142'/>
-    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-138'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-128'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-488'/>
-    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-244'/>
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-243'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-410'/>
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-409'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-415'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-250'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-459'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-880'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-184'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-316'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-322'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-1055'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-329'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-131'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-132'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-374'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-388'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-379'/>
-    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-601'/>
-    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-394'/>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-878'/>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-461'/>
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-471'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-464'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-462'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-458'/>
-    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-334'/>
-    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-470'/>
-    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-381'/>
-    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-521'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-523'/>
-    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-508'/>
-    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-516'/>
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-1059'/>
-    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-373'/>
-    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
-    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-572'/>
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-584'/>
-    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-580'/>
-    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-583'/>
-    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-668'/>
-    <pointer-type-def type-id='type-id-1245' size-in-bits='64' id='type-id-667'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-638'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-634'/>
-    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-665'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-636'/>
-    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-702'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1060'/>
-    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-140'/>
-    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-126'/>
-    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-827'/>
-    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-884'/>
-    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-520'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-510'/>
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-879'/>
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-881'/>
-    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-778'/>
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-782'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-889'/>
-    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-783'/>
-    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-781'/>
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-779'/>
-    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-143'/>
-    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-466'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-455'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-885'/>
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-962'/>
-    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-874'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-142'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-410'/>
+    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-409'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-880'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-329'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-374'/>
+    <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-382'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-127'/>
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-377'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-601'/>
+    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-603'/>
+    <pointer-type-def type-id='type-id-1218' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-461'/>
+    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1226' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-469'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-378'/>
+    <pointer-type-def type-id='type-id-1229' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-1232' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-1233' size-in-bits='64' id='type-id-470'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-877'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-385'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-1238' size-in-bits='64' id='type-id-521'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-523'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-516'/>
+    <pointer-type-def type-id='type-id-1242' size-in-bits='64' id='type-id-1059'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-373'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-1245'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-1247'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-572'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-584'/>
+    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-582'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-1253' size-in-bits='64' id='type-id-667'/>
+    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-638'/>
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-634'/>
+    <pointer-type-def type-id='type-id-1256' size-in-bits='64' id='type-id-665'/>
+    <pointer-type-def type-id='type-id-1257' size-in-bits='64' id='type-id-636'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-1260' size-in-bits='64' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-129'/>
+    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-135'/>
+    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-126'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-822'/>
+    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-884'/>
+    <pointer-type-def type-id='type-id-1268' size-in-bits='64' id='type-id-524'/>
+    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-520'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1271' size-in-bits='64' id='type-id-879'/>
+    <pointer-type-def type-id='type-id-1272' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-881'/>
+    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-778'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-781'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-889'/>
+    <pointer-type-def type-id='type-id-1280' size-in-bits='64' id='type-id-783'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-779'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-143'/>
+    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-466'/>
+    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-963'/>
+    <pointer-type-def type-id='type-id-1287' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-967'/>
+    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-685'/>
     <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-907'/>
     <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-476'/>
     <pointer-type-def type-id='type-id-475' size-in-bits='64' id='type-id-474'/>
     <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-683'/>
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-921'/>
     <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-495'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1290'/>
     <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-498'/>
     <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-518'/>
     <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-217'/>
     <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-535'/>
     <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-542'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1282'/>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1292'/>
     <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1284'/>
+    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1293'/>
     <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1285'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-1286'/>
+    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-1294'/>
+    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-1295'/>
     <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-557'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-1287'/>
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-1288'/>
-    <pointer-type-def type-id='type-id-578' size-in-bits='64' id='type-id-1289'/>
-    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-1290'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-1298'/>
+    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-578' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-587' size-in-bits='64' id='type-id-1301'/>
     <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-586'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-589'/>
     <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-595'/>
     <pointer-type-def type-id='type-id-593' size-in-bits='64' id='type-id-591'/>
     <pointer-type-def type-id='type-id-594' size-in-bits='64' id='type-id-81'/>
     <pointer-type-def type-id='type-id-596' size-in-bits='64' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1291'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-389'/>
-    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-376'/>
-    <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-793'/>
-    <pointer-type-def type-id='type-id-1295' size-in-bits='64' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-370'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-389'/>
+    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-376'/>
+    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-793'/>
+    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-890'/>
     <pointer-type-def type-id='type-id-611' size-in-bits='64' id='type-id-854'/>
     <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-654'/>
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-642'/>
     <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-655'/>
     <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-632'/>
     <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-1309'/>
     <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-92'/>
     <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-688'/>
     <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-196'/>
     <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-680'/>
-    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-1297'/>
+    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-1310'/>
     <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-714'/>
     <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-911'/>
     <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1073'/>
     <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-732'/>
-    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-969'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-969'/>
     <pointer-type-def type-id='type-id-732' size-in-bits='64' id='type-id-971'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-1312'/>
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-258'/>
     <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-734'/>
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-1027'/>
@@ -9520,98 +9533,84 @@
     <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-674'/>
     <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-272'/>
     <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-955'/>
-    <pointer-type-def type-id='type-id-1300' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-456'/>
     <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-303'/>
     <pointer-type-def type-id='type-id-758' size-in-bits='64' id='type-id-957'/>
     <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-956'/>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1301'/>
-    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-1302'/>
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-1303'/>
-    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-1306'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-1315'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-1316'/>
+    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-1317'/>
+    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-1319'/>
     <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-607'/>
     <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-786'/>
     <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-791'/>
-    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1320'/>
     <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-797'/>
     <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-643'/>
     <pointer-type-def type-id='type-id-807' size-in-bits='64' id='type-id-809'/>
     <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1308'/>
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1309'/>
-    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1310'/>
-    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1311'/>
-    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1312'/>
+    <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1321'/>
+    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-133'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1323'/>
+    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1324'/>
+    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1325'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-1326'/>
     <pointer-type-def type-id='type-id-844' size-in-bits='64' id='type-id-913'/>
     <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-912'/>
+    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-324'/>
     <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-958'/>
     <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-862'/>
     <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-106'/>
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-860'/>
     <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-692'/>
+    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-514'/>
+    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-137'/>
+    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-892'/>
+    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-893'/>
+    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-699'/>
+    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-886'/>
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-887'/>
     <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-166'/>
     <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-1313'/>
+    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-1344'/>
     <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-937'/>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1345'/>
     <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-177'/>
     <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-939'/>
     <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-691'/>
-    <pointer-type-def type-id='type-id-1315' size-in-bits='64' id='type-id-375'/>
-    <pointer-type-def type-id='type-id-1316' size-in-bits='64' id='type-id-515'/>
-    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-548'/>
-    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-406'/>
-    <pointer-type-def type-id='type-id-1319' size-in-bits='64' id='type-id-408'/>
-    <pointer-type-def type-id='type-id-1320' size-in-bits='64' id='type-id-602'/>
-    <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-639'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-139'/>
-    <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-314'/>
-    <pointer-type-def type-id='type-id-1324' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-432'/>
-    <pointer-type-def type-id='type-id-1326' size-in-bits='64' id='type-id-392'/>
-    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-1328' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-1330' size-in-bits='64' id='type-id-468'/>
-    <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-1332' size-in-bits='64' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-383'/>
-    <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-391'/>
-    <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-514'/>
-    <pointer-type-def type-id='type-id-1338' size-in-bits='64' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-892'/>
-    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-893'/>
-    <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-699'/>
-    <pointer-type-def type-id='type-id-1342' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-1344' size-in-bits='64' id='type-id-886'/>
-    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-887'/>
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-821'/>
-    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-964'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-1352'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-1346'/>
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-821'/>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-323'/>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-285'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1353'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-823'/>
+    <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-1350' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-823'/>
     <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-384'/>
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-839'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-384'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-839'/>
+    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-966'/>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-696'/>
     <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-930'/>
     <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-249'/>
     <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-964'/>
     <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-697'/>
     <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-199'/>
     <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-252'/>
@@ -9619,13 +9618,13 @@
     <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-247'/>
     <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-262'/>
     <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-187'/>
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-317'/>
     <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-311'/>
     <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-321'/>
     <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-331'/>
@@ -9667,18 +9666,19 @@
     <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-936'/>
     <pointer-type-def type-id='type-id-1413' size-in-bits='64' id='type-id-961'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-697'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-225'/>
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-883'/>
     <pointer-type-def type-id='type-id-1417' size-in-bits='64' id='type-id-882'/>
     <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1069'/>
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-397'/>
-    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-407'/>
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-310'/>
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-554'/>
-    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-511'/>
-    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-512'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-1422' size-in-bits='64' id='type-id-554'/>
+    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-511'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-549'/>
+    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-397'/>
     <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-600'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-1428'/>
     <qualified-type-def type-id='type-id-85' volatile='yes' id='type-id-898'/>
@@ -9903,20 +9903,20 @@
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-1548'/>
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-945'/>
     <function-decl name='sdhci_dumpregs' mangled-name='sdhci_dumpregs' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_dumpregs'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='53' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_enable_v4_mode' mangled-name='sdhci_enable_v4_mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_v4_mode'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='138' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_reset' mangled-name='sdhci_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
       <parameter type-id='type-id-171' name='mask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='198' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_adma_write_desc' mangled-name='sdhci_adma_write_desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_adma_write_desc'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-1428' name='desc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='663' column='1'/>
       <parameter type-id='type-id-803' name='addr' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
       <parameter type-id='type-id-71' name='len' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='664' column='1'/>
@@ -9924,34 +9924,34 @@
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_send_command' mangled-name='sdhci_send_command' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_command'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
       <parameter type-id='type-id-642' name='cmd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1342' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_calc_clk' mangled-name='sdhci_calc_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_calc_clk'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-170' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1539' column='1'/>
       <parameter type-id='type-id-561' name='actual_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1540' column='1'/>
       <return type-id='type-id-444'/>
     </function-decl>
     <function-decl name='sdhci_enable_clk' mangled-name='sdhci_enable_clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_clk'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <parameter type-id='type-id-444' name='clk' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1632' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
       <parameter type-id='type-id-170' name='clock' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1661' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_power_noreg' mangled-name='sdhci_set_power_noreg' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power_noreg'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-216' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1690' column='1'/>
       <parameter type-id='type-id-180' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1691' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_power' mangled-name='sdhci_set_power' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_power'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-216' name='mode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1764' column='1'/>
       <parameter type-id='type-id-180' name='vdd' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1765' column='1'/>
       <return type-id='type-id-1549'/>
@@ -9962,18 +9962,18 @@
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_bus_width' mangled-name='sdhci_set_bus_width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_bus_width'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
       <parameter type-id='type-id-71' name='width' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1820' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
       <parameter type-id='type-id-170' name='timing' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1840' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_set_ios' mangled-name='sdhci_set_ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_ios'>
       <parameter type-id='type-id-615' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
-      <parameter type-id='type-id-1296' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
+      <parameter type-id='type-id-1309' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='1865' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_enable_sdio_irq' mangled-name='sdhci_enable_sdio_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_sdio_irq'>
@@ -9983,23 +9983,23 @@
     </function-decl>
     <function-decl name='sdhci_start_signal_voltage_switch' mangled-name='sdhci_start_signal_voltage_switch' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_signal_voltage_switch'>
       <parameter type-id='type-id-615' name='mmc' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2147' column='1'/>
-      <parameter type-id='type-id-1296' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
+      <parameter type-id='type-id-1309' name='ios' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2148' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_start_tuning' mangled-name='sdhci_start_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_start_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2265' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_end_tuning' mangled-name='sdhci_end_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_end_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2290' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_reset_tuning' mangled-name='sdhci_reset_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2297' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_send_tuning' mangled-name='sdhci_send_tuning' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_send_tuning'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
       <parameter type-id='type-id-178' name='opcode' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='2327' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
@@ -10009,19 +10009,19 @@
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_suspend_host' mangled-name='sdhci_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_suspend_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3244' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_resume_host' mangled-name='sdhci_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_resume_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3263' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_runtime_suspend_host' mangled-name='sdhci_runtime_suspend_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_suspend_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3301' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_runtime_resume_host' mangled-name='sdhci_runtime_resume_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_runtime_resume_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <parameter type-id='type-id-71' name='soft_reset' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3323' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
@@ -10035,7 +10035,7 @@
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_cqe_irq' mangled-name='sdhci_cqe_irq' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_irq'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-178' name='intmask' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-907' name='cmd_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3449' column='1'/>
       <parameter type-id='type-id-907' name='data_error' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3450' column='1'/>
@@ -10044,230 +10044,224 @@
     <function-decl name='sdhci_alloc_host' mangled-name='sdhci_alloc_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_alloc_host'>
       <parameter type-id='type-id-182' name='dev' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3499' column='1'/>
       <parameter type-id='type-id-161' name='priv_size' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3500' column='1'/>
-      <return type-id='type-id-1308'/>
+      <return type-id='type-id-1321'/>
     </function-decl>
     <function-decl name='__sdhci_read_caps' mangled-name='__sdhci_read_caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_read_caps'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
-      <parameter type-id='type-id-1352' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
+      <parameter type-id='type-id-1346' name='ver' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-1013' name='caps' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <parameter type-id='type-id-1013' name='caps1' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3568' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_setup_host' mangled-name='sdhci_setup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_setup_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='3695' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_cleanup_host' mangled-name='sdhci_cleanup_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cleanup_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4235' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='__sdhci_add_host' mangled-name='__sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_add_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4251' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_add_host' mangled-name='sdhci_add_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_add_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4313' column='1'/>
       <return type-id='type-id-71'/>
     </function-decl>
     <function-decl name='sdhci_remove_host' mangled-name='sdhci_remove_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_remove_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
       <parameter type-id='type-id-71' name='dead' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4334' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <function-decl name='sdhci_free_host' mangled-name='sdhci_free_host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_free_host'>
-      <parameter type-id='type-id-1308' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
+      <parameter type-id='type-id-1321' name='host' filepath='/ws/android/kernel/aosp/common-mainline/common/drivers/mmc/host/sdhci.c' line='4385' column='1'/>
       <return type-id='type-id-1549'/>
     </function-decl>
     <typedef-decl name='fl_owner_t' type-id='type-id-124' filepath='/ws/android/kernel/aosp/common-mainline/common/include/linux/fs.h' line='1012' column='1' id='type-id-361'/>
     <type-decl name='void' id='type-id-1549'/>
     <pointer-type-def type-id='type-id-1549' id='type-id-124'/>
-    <function-type size-in-bits='64' id='type-id-1317'>
-      <return type-id='type-id-168'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1318'>
+    <function-type size-in-bits='64' id='type-id-1086'>
       <parameter type-id='type-id-401'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1319'>
+    <function-type size-in-bits='64' id='type-id-1087'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1320'>
+    <function-type size-in-bits='64' id='type-id-1088'>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1321'>
+    <function-type size-in-bits='64' id='type-id-1089'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1084'/>
+      <parameter type-id='type-id-1092'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1322'>
+    <function-type size-in-bits='64' id='type-id-1090'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-1057'/>
       <return type-id='type-id-168'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1085'>
+    <function-type size-in-bits='64' id='type-id-1091'>
+      <return type-id='type-id-168'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1093'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1086'>
+    <function-type size-in-bits='64' id='type-id-1094'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1353'/>
+      <parameter type-id='type-id-1351'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1087'>
+    <function-type size-in-bits='64' id='type-id-1095'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1353'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1351'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1093'>
+    <function-type size-in-bits='64' id='type-id-1101'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1144'/>
+      <parameter type-id='type-id-1152'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1094'>
+    <function-type size-in-bits='64' id='type-id-1102'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1096'>
+    <function-type size-in-bits='64' id='type-id-1104'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-153'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-200'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1153'>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1114'/>
+      <parameter type-id='type-id-1122'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1154'>
       <parameter type-id='type-id-399'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1155'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-233'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1161'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
-      <return type-id='type-id-1150'/>
+      <return type-id='type-id-1160'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-69'/>
-      <return type-id='type-id-1152'/>
+      <return type-id='type-id-1162'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-430'/>
       <return type-id='type-id-48'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1155'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1299'>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-50'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-401'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1161'>
+    <function-type size-in-bits='64' id='type-id-1169'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-290'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1162'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <parameter type-id='type-id-290'/>
       <return type-id='type-id-290'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1165'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <parameter type-id='type-id-166'/>
       <return type-id='type-id-69'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1166'>
-      <return type-id='type-id-71'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1325'>
-      <return type-id='type-id-425'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1167'>
+    <function-type size-in-bits='64' id='type-id-1175'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1168'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1169'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1170'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <parameter type-id='type-id-24'/>
-      <parameter type-id='type-id-1117'/>
+      <parameter type-id='type-id-1125'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1171'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-1117'/>
+      <parameter type-id='type-id-1125'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1172'>
-      <parameter type-id='type-id-1100'/>
+    <function-type size-in-bits='64' id='type-id-1180'>
+      <parameter type-id='type-id-1108'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1173'>
-      <parameter type-id='type-id-1100'/>
-      <parameter type-id='type-id-1306'/>
+    <function-type size-in-bits='64' id='type-id-1181'>
+      <parameter type-id='type-id-1108'/>
+      <parameter type-id='type-id-1319'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1174'>
-      <parameter type-id='type-id-1100'/>
+    <function-type size-in-bits='64' id='type-id-1182'>
+      <parameter type-id='type-id-1108'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-1135'/>
+      <parameter type-id='type-id-1143'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-1183'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-629'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1176'>
+    <function-type size-in-bits='64' id='type-id-1184'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-170'/>
-      <parameter type-id='type-id-1163'/>
+      <parameter type-id='type-id-1171'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1177'>
+    <function-type size-in-bits='64' id='type-id-1185'>
       <parameter type-id='type-id-401'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-170'/>
@@ -10275,80 +10269,80 @@
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-1186'>
       <parameter type-id='type-id-401'/>
-      <parameter type-id='type-id-1158'/>
+      <parameter type-id='type-id-1166'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
-      <parameter type-id='type-id-1133'/>
+    <function-type size-in-bits='64' id='type-id-1187'>
+      <parameter type-id='type-id-1141'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1179'>
-      <parameter type-id='type-id-1133'/>
-      <parameter type-id='type-id-1287'/>
+    <function-type size-in-bits='64' id='type-id-1188'>
+      <parameter type-id='type-id-1141'/>
+      <parameter type-id='type-id-1296'/>
       <parameter type-id='type-id-178'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1181'>
+    <function-type size-in-bits='64' id='type-id-1189'>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1182'>
+    <function-type size-in-bits='64' id='type-id-1190'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1330'>
+    <function-type size-in-bits='64' id='type-id-1328'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1183'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1164'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-1193'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-1493'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-1194'>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-1195'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1196'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-268'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1188'>
+    <function-type size-in-bits='64' id='type-id-1197'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-1293'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-1198'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1284'/>
+      <parameter type-id='type-id-268'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-1199'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
@@ -10356,21 +10350,21 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1191'>
+    <function-type size-in-bits='64' id='type-id-1200'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1310'/>
+      <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-124'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1201'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-210'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1202'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-124'/>
@@ -10379,8 +10373,8 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
-      <parameter type-id='type-id-1148'/>
+    <function-type size-in-bits='64' id='type-id-1203'>
+      <parameter type-id='type-id-1156'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-308'/>
@@ -10388,11 +10382,11 @@
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1196'>
-      <parameter type-id='type-id-1150'/>
+    <function-type size-in-bits='64' id='type-id-1204'>
+      <parameter type-id='type-id-1160'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1206'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-308'/>
@@ -10402,7 +10396,7 @@
       <parameter type-id='type-id-1428'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1199'>
+    <function-type size-in-bits='64' id='type-id-1207'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-308'/>
@@ -10412,33 +10406,33 @@
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1205'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-589'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1331'>
+    <function-type size-in-bits='64' id='type-id-1329'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1332'>
+    <function-type size-in-bits='64' id='type-id-1330'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1200'>
+    <function-type size-in-bits='64' id='type-id-1208'>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1148'/>
+      <parameter type-id='type-id-1156'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1326'>
+    <function-type size-in-bits='64' id='type-id-1302'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-346'/>
@@ -10447,7 +10441,7 @@
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-308'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1336'>
+    <function-type size-in-bits='64' id='type-id-1333'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-346'/>
@@ -10456,124 +10450,124 @@
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1201'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1203'>
+    <function-type size-in-bits='64' id='type-id-1213'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-85'/>
-      <parameter type-id='type-id-1157'/>
+      <parameter type-id='type-id-1165'/>
       <parameter type-id='type-id-1428'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1327'>
+    <function-type size-in-bits='64' id='type-id-1303'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-308'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1206'>
+    <function-type size-in-bits='64' id='type-id-1212'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1292'>
+    <function-type size-in-bits='64' id='type-id-1305'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1333'>
+    <function-type size-in-bits='64' id='type-id-1331'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-308'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1202'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1334'>
+    <function-type size-in-bits='64' id='type-id-1332'>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-928'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1204'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1335'>
+    <function-type size-in-bits='64' id='type-id-1334'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1293'>
+    <function-type size-in-bits='64' id='type-id-1306'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1207'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1205'>
+    <function-type size-in-bits='64' id='type-id-1209'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-361'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1208'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <parameter type-id='type-id-360'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1209'>
+    <function-type size-in-bits='64' id='type-id-1217'>
       <parameter type-id='type-id-360'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-589'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1218'>
       <parameter type-id='type-id-1472'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1221'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1222'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-346'/>
@@ -10581,7 +10575,7 @@
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1223'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-69'/>
@@ -10589,182 +10583,182 @@
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1224'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1217'>
+    <function-type size-in-bits='64' id='type-id-1225'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1218'>
+    <function-type size-in-bits='64' id='type-id-1226'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-165'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1227'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1156'/>
+      <parameter type-id='type-id-1164'/>
       <parameter type-id='type-id-210'/>
       <parameter type-id='type-id-210'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1228'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-346'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1221'>
+    <function-type size-in-bits='64' id='type-id-1229'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1222'>
+    <function-type size-in-bits='64' id='type-id-1230'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1285'/>
+      <parameter type-id='type-id-1294'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1223'>
+    <function-type size-in-bits='64' id='type-id-1231'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-439'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1224'>
+    <function-type size-in-bits='64' id='type-id-1232'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1304'/>
+      <parameter type-id='type-id-1317'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1225'>
+    <function-type size-in-bits='64' id='type-id-1233'>
       <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-1314'/>
+      <parameter type-id='type-id-1345'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1226'>
+    <function-type size-in-bits='64' id='type-id-1234'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1227'>
+    <function-type size-in-bits='64' id='type-id-1235'>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1228'>
+    <function-type size-in-bits='64' id='type-id-1236'>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1229'>
+    <function-type size-in-bits='64' id='type-id-1237'>
       <parameter type-id='type-id-495'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1230'>
+    <function-type size-in-bits='64' id='type-id-1238'>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-154'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1231'>
+    <function-type size-in-bits='64' id='type-id-1239'>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1232'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1240'>
+      <parameter type-id='type-id-1290'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1337'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1335'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-24'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1233'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1241'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1234'>
+    <function-type size-in-bits='64' id='type-id-1242'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-1454'/>
-      <parameter type-id='type-id-1122'/>
+      <parameter type-id='type-id-1130'/>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1235'>
-      <parameter type-id='type-id-1283'/>
+    <function-type size-in-bits='64' id='type-id-1243'>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1338'>
-      <parameter type-id='type-id-1283'/>
+    <function-type size-in-bits='64' id='type-id-1336'>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-1484'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1339'>
+    <function-type size-in-bits='64' id='type-id-1337'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1340'>
+    <function-type size-in-bits='64' id='type-id-1338'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1236'>
+    <function-type size-in-bits='64' id='type-id-1244'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1238'>
+    <function-type size-in-bits='64' id='type-id-1246'>
       <parameter type-id='type-id-557'/>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1284'/>
+      <parameter type-id='type-id-1293'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1240'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1248'>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1241'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1249'>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-50'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1242'>
-      <parameter type-id='type-id-1289'/>
-      <parameter type-id='type-id-1290'/>
+    <function-type size-in-bits='64' id='type-id-1250'>
+      <parameter type-id='type-id-1300'/>
+      <parameter type-id='type-id-1301'/>
       <parameter type-id='type-id-178'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1243'>
-      <parameter type-id='type-id-1289'/>
+    <function-type size-in-bits='64' id='type-id-1251'>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-696'/>
       <parameter type-id='type-id-696'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1244'>
+    <function-type size-in-bits='64' id='type-id-1252'>
       <parameter type-id='type-id-654'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1245'>
+    <function-type size-in-bits='64' id='type-id-1253'>
       <parameter type-id='type-id-654'/>
       <parameter type-id='type-id-170'/>
       <parameter type-id='type-id-71'/>
@@ -10772,137 +10766,131 @@
       <parameter type-id='type-id-907'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1246'>
+    <function-type size-in-bits='64' id='type-id-1254'>
       <parameter type-id='type-id-615'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1247'>
+    <function-type size-in-bits='64' id='type-id-1255'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-654'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1248'>
+    <function-type size-in-bits='64' id='type-id-1256'>
       <parameter type-id='type-id-615'/>
-      <parameter type-id='type-id-1296'/>
+      <parameter type-id='type-id-1309'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1249'>
+    <function-type size-in-bits='64' id='type-id-1257'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-92'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1250'>
+    <function-type size-in-bits='64' id='type-id-1258'>
       <parameter type-id='type-id-615'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1251'>
+    <function-type size-in-bits='64' id='type-id-1259'>
       <parameter type-id='type-id-196'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1341'>
+    <function-type size-in-bits='64' id='type-id-1339'>
       <parameter type-id='type-id-680'/>
-      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1310'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1342'>
+    <function-type size-in-bits='64' id='type-id-1340'>
       <parameter type-id='type-id-680'/>
-      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1310'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-161'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1252'>
+    <function-type size-in-bits='64' id='type-id-1260'>
       <parameter type-id='type-id-714'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1253'>
+    <function-type size-in-bits='64' id='type-id-1261'>
       <parameter type-id='type-id-732'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1254'>
+    <function-type size-in-bits='64' id='type-id-1262'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1255'>
+    <function-type size-in-bits='64' id='type-id-1263'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1256'>
+    <function-type size-in-bits='64' id='type-id-1264'>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-1548'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1343'>
+    <function-type size-in-bits='64' id='type-id-1341'>
       <parameter type-id='type-id-928'/>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1294'>
-      <parameter type-id='type-id-1307'/>
+    <function-type size-in-bits='64' id='type-id-1307'>
+      <parameter type-id='type-id-1320'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1257'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1265'>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1258'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1266'>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1259'>
+    <function-type size-in-bits='64' id='type-id-1267'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1260'>
+    <function-type size-in-bits='64' id='type-id-1268'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-495'/>
       <parameter type-id='type-id-498'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1261'>
+    <function-type size-in-bits='64' id='type-id-1269'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-498'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1262'>
+    <function-type size-in-bits='64' id='type-id-1270'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1263'>
+    <function-type size-in-bits='64' id='type-id-1271'>
       <parameter type-id='type-id-166'/>
       <return type-id='type-id-71'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1272'>
-      <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-326'/>
-      <parameter type-id='type-id-1301'/>
-      <return type-id='type-id-71'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1264'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1265'>
+    <function-type size-in-bits='64' id='type-id-1273'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-907'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1344'>
+    <function-type size-in-bits='64' id='type-id-1342'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-24'/>
@@ -10910,7 +10898,7 @@
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1345'>
+    <function-type size-in-bits='64' id='type-id-1343'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-153'/>
@@ -10918,85 +10906,91 @@
       <parameter type-id='type-id-308'/>
       <return type-id='type-id-1065'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1266'>
+    <function-type size-in-bits='64' id='type-id-1274'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-71'/>
-      <parameter type-id='type-id-1133'/>
+      <parameter type-id='type-id-1141'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1267'>
+    <function-type size-in-bits='64' id='type-id-1275'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-71'/>
-      <parameter type-id='type-id-1302'/>
+      <parameter type-id='type-id-1315'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1268'>
+    <function-type size-in-bits='64' id='type-id-1276'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1286'/>
+      <parameter type-id='type-id-1295'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1269'>
+    <function-type size-in-bits='64' id='type-id-1277'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1286'/>
-      <parameter type-id='type-id-1301'/>
+      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1314'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1270'>
+    <function-type size-in-bits='64' id='type-id-1278'>
+      <parameter type-id='type-id-166'/>
+      <parameter type-id='type-id-326'/>
+      <parameter type-id='type-id-1314'/>
+      <return type-id='type-id-71'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1279'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1271'>
+    <function-type size-in-bits='64' id='type-id-1280'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1303'/>
+      <parameter type-id='type-id-1316'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1295'>
+    <function-type size-in-bits='64' id='type-id-1308'>
       <parameter type-id='type-id-166'/>
-      <parameter type-id='type-id-1311'/>
+      <parameter type-id='type-id-1325'/>
       <return type-id='type-id-85'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1273'>
+    <function-type size-in-bits='64' id='type-id-1281'>
       <parameter type-id='type-id-166'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1274'>
+    <function-type size-in-bits='64' id='type-id-1282'>
       <parameter type-id='type-id-1545'/>
       <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-1309'/>
+      <parameter type-id='type-id-1323'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1275'>
+    <function-type size-in-bits='64' id='type-id-1283'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-233'/>
-      <parameter type-id='type-id-1164'/>
+      <parameter type-id='type-id-1173'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1276'>
+    <function-type size-in-bits='64' id='type-id-1284'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1277'>
+    <function-type size-in-bits='64' id='type-id-1285'>
       <parameter type-id='type-id-733'/>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-233'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1278'>
+    <function-type size-in-bits='64' id='type-id-1286'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1279'>
+    <function-type size-in-bits='64' id='type-id-1287'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1280'>
+    <function-type size-in-bits='64' id='type-id-1288'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-124'/>
@@ -11004,34 +10998,40 @@
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1298'>
+    <function-type size-in-bits='64' id='type-id-1289'>
+      <return type-id='type-id-71'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1297'>
+      <return type-id='type-id-425'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1311'>
       <parameter type-id='type-id-950'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-732'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1300'>
+    <function-type size-in-bits='64' id='type-id-1313'>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-439'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1305'>
+    <function-type size-in-bits='64' id='type-id-1318'>
       <parameter type-id='type-id-69'/>
-      <return type-id='type-id-1304'/>
+      <return type-id='type-id-1317'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1328'>
+    <function-type size-in-bits='64' id='type-id-1322'>
       <parameter type-id='type-id-358'/>
       <parameter type-id='type-id-1063'/>
       <return type-id='type-id-1063'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1329'>
+    <function-type size-in-bits='64' id='type-id-1327'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-161'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1347'>
+    <function-type size-in-bits='64' id='type-id-1348'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-210'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1323'>
+    <function-type size-in-bits='64' id='type-id-1157'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-732'/>
       <parameter type-id='type-id-120'/>
@@ -11040,7 +11040,7 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-803'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1324'>
+    <function-type size-in-bits='64' id='type-id-1158'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-972'/>
       <parameter type-id='type-id-161'/>
@@ -11048,12 +11048,12 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-803'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1315'>
+    <function-type size-in-bits='64' id='type-id-1082'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-1512'/>
       <return type-id='type-id-1044'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1355'>
+    <function-type size-in-bits='64' id='type-id-1353'>
       <parameter type-id='type-id-346'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
@@ -11061,57 +11061,54 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1316'>
-      <parameter type-id='type-id-1281'/>
+    <function-type size-in-bits='64' id='type-id-1083'>
+      <parameter type-id='type-id-1290'/>
       <parameter type-id='type-id-1512'/>
       <return type-id='type-id-1044'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1348'>
+    <function-type size-in-bits='64' id='type-id-1349'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1082'/>
+      <parameter type-id='type-id-1084'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-154'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1349'>
+    <function-type size-in-bits='64' id='type-id-1350'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1083'/>
+      <parameter type-id='type-id-1085'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-154'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1354'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1352'>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-170'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1346'>
-      <parameter type-id='type-id-1308'/>
+    <function-type size-in-bits='64' id='type-id-1347'>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-178'/>
       <return type-id='type-id-178'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1356'>
-      <parameter type-id='type-id-1312'/>
-      <parameter type-id='type-id-1311'/>
+    <function-type size-in-bits='64' id='type-id-1354'>
+      <parameter type-id='type-id-1326'/>
+      <parameter type-id='type-id-1325'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1357'>
+    <function-type size-in-bits='64' id='type-id-1355'>
       <parameter type-id='type-id-950'/>
       <return type-id='type-id-120'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1350'>
-      <parameter type-id='type-id-1359'/>
+    <function-type size-in-bits='64' id='type-id-1358'>
+      <parameter type-id='type-id-1357'/>
       <return type-id='type-id-1068'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1351'>
-      <parameter type-id='type-id-1359'/>
+    <function-type size-in-bits='64' id='type-id-1359'>
+      <parameter type-id='type-id-1357'/>
       <parameter type-id='type-id-54'/>
       <return type-id='type-id-1068'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1358'>
-      <parameter type-id='type-id-1299'/>
+    <function-type size-in-bits='64' id='type-id-1356'>
+      <parameter type-id='type-id-1312'/>
       <return type-id='type-id-733'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1045'>
-      <return type-id='type-id-1549'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-1360'>
       <parameter type-id='type-id-193'/>
       <return type-id='type-id-1549'/>
@@ -11121,8 +11118,8 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1362'>
-      <parameter type-id='type-id-1133'/>
-      <parameter type-id='type-id-1299'/>
+      <parameter type-id='type-id-1141'/>
+      <parameter type-id='type-id-1312'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1363'>
@@ -11142,30 +11139,30 @@
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1370'>
+    <function-type size-in-bits='64' id='type-id-1367'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-168'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1373'>
+    <function-type size-in-bits='64' id='type-id-1371'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-644'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1367'>
+    <function-type size-in-bits='64' id='type-id-1370'>
       <parameter type-id='type-id-182'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1368'>
+    <function-type size-in-bits='64' id='type-id-1372'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1369'>
+    <function-type size-in-bits='64' id='type-id-1373'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-643'/>
       <parameter type-id='type-id-71'/>
@@ -11173,14 +11170,14 @@
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1371'>
+    <function-type size-in-bits='64' id='type-id-1368'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
       <parameter type-id='type-id-47'/>
       <return type-id='type-id-1549'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1372'>
+    <function-type size-in-bits='64' id='type-id-1369'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-161'/>
@@ -11204,7 +11201,7 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1376'>
-      <parameter type-id='type-id-1150'/>
+      <parameter type-id='type-id-1160'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1377'>
@@ -11243,11 +11240,11 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1384'>
-      <parameter type-id='type-id-1281'/>
+      <parameter type-id='type-id-1290'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1385'>
-      <parameter type-id='type-id-1283'/>
+      <parameter type-id='type-id-1292'/>
       <parameter type-id='type-id-85'/>
       <parameter type-id='type-id-85'/>
       <return type-id='type-id-1549'/>
@@ -11258,16 +11255,16 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1387'>
       <parameter type-id='type-id-197'/>
-      <parameter type-id='type-id-1288'/>
-      <parameter type-id='type-id-1282'/>
+      <parameter type-id='type-id-1298'/>
+      <parameter type-id='type-id-1291'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1388'>
-      <parameter type-id='type-id-1289'/>
+      <parameter type-id='type-id-1300'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1389'>
-      <parameter type-id='type-id-1289'/>
+      <parameter type-id='type-id-1300'/>
       <parameter type-id='type-id-50'/>
       <return type-id='type-id-1549'/>
     </function-type>
@@ -11287,7 +11284,7 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1393'>
       <parameter type-id='type-id-615'/>
-      <parameter type-id='type-id-1296'/>
+      <parameter type-id='type-id-1309'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1394'>
@@ -11320,8 +11317,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-1400'>
       <parameter type-id='type-id-732'/>
-      <parameter type-id='type-id-1084'/>
-      <parameter type-id='type-id-1084'/>
+      <parameter type-id='type-id-1092'/>
+      <parameter type-id='type-id-1092'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1401'>
@@ -11335,37 +11332,37 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1402'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1403'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-71'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1404'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-642'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1405'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-171'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1406'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-216'/>
       <parameter type-id='type-id-180'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1407'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-170'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1408'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1321'/>
       <parameter type-id='type-id-1428'/>
       <parameter type-id='type-id-803'/>
       <parameter type-id='type-id-71'/>
@@ -11387,7 +11384,7 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1412'>
-      <parameter type-id='type-id-1313'/>
+      <parameter type-id='type-id-1344'/>
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1413'>
@@ -11395,11 +11392,14 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1414'>
-      <parameter type-id='type-id-1359'/>
+      <parameter type-id='type-id-1357'/>
       <parameter type-id='type-id-120'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-1549'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1045'>
+      <return type-id='type-id-1549'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1415'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-1549'/>
@@ -11419,44 +11419,44 @@
       <return type-id='type-id-1549'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1419'>
-      <return type-id='type-id-124'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1420'>
       <parameter type-id='type-id-401'/>
-      <parameter type-id='type-id-1105'/>
+      <parameter type-id='type-id-1113'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1421'>
+    <function-type size-in-bits='64' id='type-id-1420'>
       <parameter type-id='type-id-182'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1422'>
+    <function-type size-in-bits='64' id='type-id-1421'>
       <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-161'/>
-      <parameter type-id='type-id-1149'/>
+      <parameter type-id='type-id-1159'/>
       <parameter type-id='type-id-116'/>
       <parameter type-id='type-id-120'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1423'>
+    <function-type size-in-bits='64' id='type-id-1422'>
       <parameter type-id='type-id-197'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1424'>
+    <function-type size-in-bits='64' id='type-id-1423'>
       <parameter type-id='type-id-505'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1425'>
+    <function-type size-in-bits='64' id='type-id-1424'>
       <parameter type-id='type-id-505'/>
       <parameter type-id='type-id-124'/>
-      <parameter type-id='type-id-1291'/>
+      <parameter type-id='type-id-1304'/>
       <return type-id='type-id-124'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1426'>
+    <function-type size-in-bits='64' id='type-id-1425'>
       <parameter type-id='type-id-1527'/>
       <return type-id='type-id-124'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1426'>
+      <return type-id='type-id-124'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1427'>
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-124'/>
diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 88bc389d..5033c7c1 100644
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -237,8 +237,8 @@
         <var-decl name='tm_zone' type-id='80f4b756' visibility='default' filepath='bionic/libc/include/time.h' line='57' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AAudioStream_dataCallback' type-id='3405aa89' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
-    <typedef-decl name='AAudioStream_errorCallback' type-id='ea545054' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' id='2e91990d'/>
+    <typedef-decl name='AAudioStream_dataCallback' type-id='824043e8' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='880' column='1' id='edb6186f'/>
+    <typedef-decl name='AAudioStream_errorCallback' type-id='00238b2f' filepath='frameworks/av/media/libaaudio/include/aaudio/AAudio.h' line='966' column='1' id='2e91990d'/>
     <typedef-decl name='__builtin_va_list' type-id='30357e0a' id='7f896fb4'/>
     <typedef-decl name='__clockid_t' type-id='7eb128d4' filepath='bionic/libc/include/sys/types.h' line='56' column='1' id='08f9a87a'/>
     <typedef-decl name='__int32_t' type-id='95e97e5e' filepath='bionic/libc/include/stdint.h' line='40' column='1' id='33f57a65'/>
@@ -287,6 +287,7 @@
     <type-decl name='unsigned long int' size-in-bits='64' id='f0981eec'/>
     <type-decl name='unsigned long long int' size-in-bits='64' id='f0981eed'/>
     <type-decl name='wchar_t' size-in-bits='32' id='c523b9f1'/>
+    <pointer-type-def type-id='4ea6ed15' size-in-bits='64' id='824043e8'/>
     <pointer-type-def type-id='2e552d01' size-in-bits='64' id='6de3cf18'/>
     <reference-type-def kind='lvalue' type-id='f74dc428' size-in-bits='64' id='bb997e32'/>
     <reference-type-def kind='rvalue' type-id='f74dc428' size-in-bits='64' id='66a1797c'/>
@@ -318,16 +319,15 @@
     <pointer-type-def type-id='f077d3f8' size-in-bits='64' id='5ea27396'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='64' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='64' id='c5f12884'/>
-    <pointer-type-def type-id='96ee24a5' size-in-bits='64' id='585e1de9'/>
+    <pointer-type-def type-id='96ee24a5' size-in-bits='64' id='67230494'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='64' id='7292109c'/>
     <pointer-type-def type-id='9da381c4' size-in-bits='64' id='cb785ebf'/>
     <pointer-type-def type-id='a0eb0f09' size-in-bits='64' id='7408d286'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='64' id='a68021ce'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='64' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='64' id='d915a820'/>
-    <pointer-type-def type-id='4ea6ed15' size-in-bits='64' id='3405aa89'/>
-    <pointer-type-def type-id='ee076206' size-in-bits='64' id='953b12f8'/>
-    <pointer-type-def type-id='513cf94a' size-in-bits='64' id='ea545054'/>
+    <pointer-type-def type-id='513cf94a' size-in-bits='64' id='00238b2f'/>
+    <pointer-type-def type-id='30a82da4' size-in-bits='64' id='c640490b'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='64' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='64' id='01efdaf1'/>
     <pointer-type-def type-id='f41d1deb' size-in-bits='64' id='b2a1b704'/>
@@ -1504,11 +1504,11 @@
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='atexit' filepath='bionic/libc/include/stdlib.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='bionic/libc/include/stdlib.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='bionic/libc/include/stdlib.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1574,14 +1574,14 @@
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='eaa32e2f'/>
     </function-decl>
     <function-decl name='qsort' filepath='bionic/libc/include/stdlib.h' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='ldiv' filepath='bionic/libc/include/stdlib.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2313,14 +2313,14 @@
       <parameter type-id='eaa32e2f'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='64' id='ee076206'>
-      <return type-id='48b5725f'/>
-    </function-type>
     <function-type size-in-bits='64' id='513cf94a'>
       <parameter type-id='b2a1b704'/>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='da775bc6'/>
       <return type-id='48b5725f'/>
     </function-type>
+    <function-type size-in-bits='64' id='30a82da4'>
+      <return type-id='48b5725f'/>
+    </function-type>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 32c1a0a4..3b7d5ad6 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1465,11 +1465,11 @@
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='atexit' filepath='bionic/libc/include/stdlib.h' line='52' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='bionic/libc/include/stdlib.h' line='54' column='1' visibility='default' binding='global' size-in-bits='32'>
-      <parameter type-id='953b12f8'/>
+      <parameter type-id='c640490b'/>
       <return type-id='95e97e5e'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='bionic/libc/include/stdlib.h' line='55' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1530,14 +1530,14 @@
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='eaa32e2f'/>
     </function-decl>
     <function-decl name='qsort' filepath='bionic/libc/include/stdlib.h' line='98' column='1' visibility='default' binding='global' size-in-bits='32'>
       <parameter type-id='eaa32e2f'/>
       <parameter type-id='b59d7dce'/>
       <parameter type-id='b59d7dce'/>
-      <parameter type-id='585e1de9'/>
+      <parameter type-id='67230494'/>
       <return type-id='48b5725f'/>
     </function-decl>
     <function-decl name='ldiv' filepath='bionic/libc/include/stdlib.h' line='141' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -1978,7 +1978,7 @@
       <parameter is-variadic='yes'/>
       <return type-id='95e97e5e'/>
     </function-decl>
-    <function-type size-in-bits='32' id='ee076206'>
+    <function-type size-in-bits='32' id='30a82da4'>
       <return type-id='48b5725f'/>
     </function-type>
   </abi-instr>
@@ -3438,691 +3438,691 @@
         <var-decl name='reserved3' type-id='eaa32e2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='153' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='GetVersion' type-id='18d755d9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
+        <var-decl name='GetVersion' type-id='f3fd167a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='155' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='DefineClass' type-id='c1bcbe60' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
+        <var-decl name='DefineClass' type-id='30ee23e3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='157' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='FindClass' type-id='a247d414' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
+        <var-decl name='FindClass' type-id='2b174cab' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='159' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='FromReflectedMethod' type-id='95094585' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
+        <var-decl name='FromReflectedMethod' type-id='70351828' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='161' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='FromReflectedField' type-id='2c8531ee' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
+        <var-decl name='FromReflectedField' type-id='6098e447' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='162' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='ToReflectedMethod' type-id='a19c74f7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
+        <var-decl name='ToReflectedMethod' type-id='0e7dc576' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='164' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='GetSuperclass' type-id='61e793ce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
+        <var-decl name='GetSuperclass' type-id='a96e9567' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='166' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='352'>
-        <var-decl name='IsAssignableFrom' type-id='192dd735' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
+        <var-decl name='IsAssignableFrom' type-id='f42dbf4e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='167' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='ToReflectedField' type-id='d17c3f88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
+        <var-decl name='ToReflectedField' type-id='7bbfad59' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='170' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='Throw' type-id='c8a34da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
+        <var-decl name='Throw' type-id='797bd39f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='172' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='ThrowNew' type-id='98515169' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
+        <var-decl name='ThrowNew' type-id='bbfa68cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='173' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='ExceptionOccurred' type-id='b3dfc495' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
+        <var-decl name='ExceptionOccurred' type-id='a8a22fa6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='174' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='ExceptionDescribe' type-id='8bc971a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
+        <var-decl name='ExceptionDescribe' type-id='e45dd401' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='175' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='ExceptionClear' type-id='8bc971a6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='176' column='1'/>
+        <var-decl name='ExceptionClear' type-id='e45dd401' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='176' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='FatalError' type-id='2deb20e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
+        <var-decl name='FatalError' type-id='7a98879a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='177' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='PushLocalFrame' type-id='8770ee20' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
+        <var-decl name='PushLocalFrame' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='179' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='PopLocalFrame' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
+        <var-decl name='PopLocalFrame' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='NewGlobalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
+        <var-decl name='NewGlobalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='182' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='DeleteGlobalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
+        <var-decl name='DeleteGlobalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='DeleteLocalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
+        <var-decl name='DeleteLocalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='184' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='IsSameObject' type-id='00722fb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
+        <var-decl name='IsSameObject' type-id='d2595e76' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='185' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='NewLocalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
+        <var-decl name='NewLocalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='187' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='EnsureLocalCapacity' type-id='8770ee20' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
+        <var-decl name='EnsureLocalCapacity' type-id='e459a6af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='188' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='864'>
-        <var-decl name='AllocObject' type-id='32aa4f8d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
+        <var-decl name='AllocObject' type-id='2365fdd8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='NewObject' type-id='260c4c40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
+        <var-decl name='NewObject' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='191' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='NewObjectV' type-id='775787db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
+        <var-decl name='NewObjectV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='192' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='NewObjectA' type-id='38637da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
+        <var-decl name='NewObjectA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='193' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='GetObjectClass' type-id='f50e7349' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
+        <var-decl name='GetObjectClass' type-id='15829ccc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='195' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='IsInstanceOf' type-id='bfafe7be' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
+        <var-decl name='IsInstanceOf' type-id='af9b66a1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='196' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1056'>
-        <var-decl name='GetMethodID' type-id='7b39afc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
+        <var-decl name='GetMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='197' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='CallObjectMethod' type-id='ceea3b8d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
+        <var-decl name='CallObjectMethod' type-id='38711a82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='199' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1120'>
-        <var-decl name='CallObjectMethodV' type-id='e2a33260' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
+        <var-decl name='CallObjectMethodV' type-id='4025b733' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='200' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='CallObjectMethodA' type-id='d469a98b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
+        <var-decl name='CallObjectMethodA' type-id='ff005e88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='201' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1184'>
-        <var-decl name='CallBooleanMethod' type-id='dcc01f40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
+        <var-decl name='CallBooleanMethod' type-id='c5017f63' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='202' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='CallBooleanMethodV' type-id='f47c20db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
+        <var-decl name='CallBooleanMethodV' type-id='9b7e723c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='203' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1248'>
-        <var-decl name='CallBooleanMethodA' type-id='fb4bf8a2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
+        <var-decl name='CallBooleanMethodA' type-id='286a904d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='204' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='CallByteMethod' type-id='b8872911' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
+        <var-decl name='CallByteMethod' type-id='a6e4e20e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='205' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1312'>
-        <var-decl name='CallByteMethodV' type-id='8e395004' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
+        <var-decl name='CallByteMethodV' type-id='b73332bf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='206' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='CallByteMethodA' type-id='bd039867' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
+        <var-decl name='CallByteMethodA' type-id='7e64ceb4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1376'>
-        <var-decl name='CallCharMethod' type-id='276929e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
+        <var-decl name='CallCharMethod' type-id='abb6ff0a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='208' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='CallCharMethodV' type-id='e6cee188' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
+        <var-decl name='CallCharMethodV' type-id='3940caeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='209' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1440'>
-        <var-decl name='CallCharMethodA' type-id='75022493' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
+        <var-decl name='CallCharMethodA' type-id='18ca9f30' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='210' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='CallShortMethod' type-id='9f2ec5e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
+        <var-decl name='CallShortMethod' type-id='0f8d5f3b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='211' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1504'>
-        <var-decl name='CallShortMethodV' type-id='4ab10d53' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
+        <var-decl name='CallShortMethodV' type-id='1c93d4e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='212' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='CallShortMethodA' type-id='4ed5bc7a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
+        <var-decl name='CallShortMethodA' type-id='7b6e1be5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='CallIntMethod' type-id='9f2ec5e9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
+        <var-decl name='CallIntMethod' type-id='0f8d5f3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='CallIntMethodV' type-id='4ab10d54' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
+        <var-decl name='CallIntMethodV' type-id='1c93d4e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='215' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1632'>
-        <var-decl name='CallIntMethodA' type-id='4ed5bc7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
+        <var-decl name='CallIntMethodA' type-id='7b6e1be6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='216' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='CallLongMethod' type-id='9f2ec5ea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
+        <var-decl name='CallLongMethod' type-id='0f8d5f3d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='217' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1696'>
-        <var-decl name='CallLongMethodV' type-id='4ab10d55' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
+        <var-decl name='CallLongMethodV' type-id='1c93d4e6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='218' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='CallLongMethodA' type-id='4ed5bc7c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
+        <var-decl name='CallLongMethodA' type-id='7b6e1be7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='219' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
-        <var-decl name='CallFloatMethod' type-id='9f5f6d1f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
+        <var-decl name='CallFloatMethod' type-id='29b6037c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='220' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='CallFloatMethodV' type-id='a1d47c16' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
+        <var-decl name='CallFloatMethodV' type-id='e91668fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='221' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1824'>
-        <var-decl name='CallFloatMethodA' type-id='81649ee5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
+        <var-decl name='CallFloatMethodA' type-id='154c703a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='222' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='CallDoubleMethod' type-id='1358cb5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
+        <var-decl name='CallDoubleMethod' type-id='e06b46ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='223' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1888'>
-        <var-decl name='CallDoubleMethodV' type-id='061addf9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
+        <var-decl name='CallDoubleMethodV' type-id='fd720bfe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='CallDoubleMethodA' type-id='cce2541c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
+        <var-decl name='CallDoubleMethodA' type-id='0aafbc07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='225' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1952'>
-        <var-decl name='CallVoidMethod' type-id='d4f446a9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
+        <var-decl name='CallVoidMethod' type-id='4d8d0cb6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='226' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1984'>
-        <var-decl name='CallVoidMethodV' type-id='72df644c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
+        <var-decl name='CallVoidMethodV' type-id='c0e9d857' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='227' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2016'>
-        <var-decl name='CallVoidMethodA' type-id='7359e10f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
+        <var-decl name='CallVoidMethodA' type-id='a1f794fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='228' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='CallNonvirtualObjectMethod' type-id='36fdf2f2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethod' type-id='87683ec7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='230' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2080'>
-        <var-decl name='CallNonvirtualObjectMethodV' type-id='671a4cc1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodV' type-id='5debed90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='CallNonvirtualObjectMethodA' type-id='75e166e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
+        <var-decl name='CallNonvirtualObjectMethodA' type-id='c8123d81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='234' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2144'>
-        <var-decl name='CallNonvirtualBooleanMethod' type-id='911bafcf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethod' type-id='70076aa2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='CallNonvirtualBooleanMethodV' type-id='5502cec6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodV' type-id='f7295393' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='238' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2208'>
-        <var-decl name='CallNonvirtualBooleanMethodA' type-id='632958b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
+        <var-decl name='CallNonvirtualBooleanMethodA' type-id='fdb6d1a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='240' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='CallNonvirtualByteMethod' type-id='c5080c6e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
+        <var-decl name='CallNonvirtualByteMethod' type-id='b90b8f9b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='242' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2272'>
-        <var-decl name='CallNonvirtualByteMethodV' type-id='ac33c16d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodV' type-id='19e79f04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='244' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='CallNonvirtualByteMethodA' type-id='3f53da28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
+        <var-decl name='CallNonvirtualByteMethodA' type-id='72aad4c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='246' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2336'>
-        <var-decl name='CallNonvirtualCharMethod' type-id='d3d606ba' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
+        <var-decl name='CallNonvirtualCharMethod' type-id='3f53351f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='248' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='CallNonvirtualCharMethodV' type-id='e202bf99' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodV' type-id='60ba8818' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2400'>
-        <var-decl name='CallNonvirtualCharMethodA' type-id='429f83fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
+        <var-decl name='CallNonvirtualCharMethodA' type-id='de836af9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='252' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='CallNonvirtualShortMethod' type-id='cab20a87' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
+        <var-decl name='CallNonvirtualShortMethod' type-id='bd2b792a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='254' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2464'>
-        <var-decl name='CallNonvirtualShortMethodV' type-id='5b336a8e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodV' type-id='5f5d06cb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='256' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
-        <var-decl name='CallNonvirtualShortMethodA' type-id='5b8df47d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
+        <var-decl name='CallNonvirtualShortMethodA' type-id='51953750' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='258' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2528'>
-        <var-decl name='CallNonvirtualIntMethod' type-id='cab20a88' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
+        <var-decl name='CallNonvirtualIntMethod' type-id='bd2b792b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='260' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='CallNonvirtualIntMethodV' type-id='5b336a8f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodV' type-id='5f5d06cc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='262' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2592'>
-        <var-decl name='CallNonvirtualIntMethodA' type-id='5b8df47e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
+        <var-decl name='CallNonvirtualIntMethodA' type-id='51953751' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='264' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2624'>
-        <var-decl name='CallNonvirtualLongMethod' type-id='cab20a89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
+        <var-decl name='CallNonvirtualLongMethod' type-id='bd2b792c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='266' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2656'>
-        <var-decl name='CallNonvirtualLongMethodV' type-id='5b336a90' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodV' type-id='5f5d06cd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='268' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='CallNonvirtualLongMethodA' type-id='5b8df47f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
+        <var-decl name='CallNonvirtualLongMethodA' type-id='51953752' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='270' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2720'>
-        <var-decl name='CallNonvirtualFloatMethod' type-id='6a09952c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethod' type-id='bec66371' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='272' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2752'>
-        <var-decl name='CallNonvirtualFloatMethodV' type-id='286f4f27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodV' type-id='43ae4cf2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='274' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2784'>
-        <var-decl name='CallNonvirtualFloatMethodA' type-id='34d95ce6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
+        <var-decl name='CallNonvirtualFloatMethodA' type-id='f1447c7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='276' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='CallNonvirtualDoubleMethod' type-id='81941e91' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethod' type-id='7c6967e4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='278' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2848'>
-        <var-decl name='CallNonvirtualDoubleMethodV' type-id='57f14084' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodV' type-id='06674af5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='280' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2880'>
-        <var-decl name='CallNonvirtualDoubleMethodA' type-id='06ef81e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
+        <var-decl name='CallNonvirtualDoubleMethodA' type-id='9aee4982' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='282' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2912'>
-        <var-decl name='CallNonvirtualVoidMethod' type-id='f1b14db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethod' type-id='c003e813' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='284' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='CallNonvirtualVoidMethodV' type-id='e25f48c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodV' type-id='3d23490c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='286' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2976'>
-        <var-decl name='CallNonvirtualVoidMethodA' type-id='59a4a320' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
+        <var-decl name='CallNonvirtualVoidMethodA' type-id='49f4e2fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='288' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3008'>
-        <var-decl name='GetFieldID' type-id='700bfd71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
+        <var-decl name='GetFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='291' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3040'>
-        <var-decl name='GetObjectField' type-id='676c304c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
+        <var-decl name='GetObjectField' type-id='21976f65' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='293' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='GetBooleanField' type-id='afd19731' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
+        <var-decl name='GetBooleanField' type-id='8c01ad3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='294' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3104'>
-        <var-decl name='GetByteField' type-id='be83b1c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
+        <var-decl name='GetByteField' type-id='11c5f5c9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='295' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3136'>
-        <var-decl name='GetCharField' type-id='5b2401a4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
+        <var-decl name='GetCharField' type-id='340bfd9d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='296' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3168'>
-        <var-decl name='GetShortField' type-id='d9547e19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
+        <var-decl name='GetShortField' type-id='e3d72664' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='297' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='GetIntField' type-id='d9547e1a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
+        <var-decl name='GetIntField' type-id='e3d72665' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='298' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3232'>
-        <var-decl name='GetLongField' type-id='d9547e1b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
+        <var-decl name='GetLongField' type-id='e3d72666' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='GetFloatField' type-id='45f30d62' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
+        <var-decl name='GetFloatField' type-id='bae7b123' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3296'>
-        <var-decl name='GetDoubleField' type-id='a737306f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
+        <var-decl name='GetDoubleField' type-id='3d49369a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='SetObjectField' type-id='bc60df5e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
+        <var-decl name='SetObjectField' type-id='68835375' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3360'>
-        <var-decl name='SetBooleanField' type-id='9af031fb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
+        <var-decl name='SetBooleanField' type-id='368860b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='304' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
-        <var-decl name='SetByteField' type-id='ffc17d12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
+        <var-decl name='SetByteField' type-id='931a74f1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='305' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3424'>
-        <var-decl name='SetCharField' type-id='e9d4d69a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
+        <var-decl name='SetCharField' type-id='fc76ab83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3456'>
-        <var-decl name='SetShortField' type-id='aa5e90a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
+        <var-decl name='SetShortField' type-id='1135eb82' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='307' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3488'>
-        <var-decl name='SetIntField' type-id='aa5e90a8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
+        <var-decl name='SetIntField' type-id='1135eb83' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3520'>
-        <var-decl name='SetLongField' type-id='aa5e90a9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
+        <var-decl name='SetLongField' type-id='1135eb84' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3552'>
-        <var-decl name='SetFloatField' type-id='d69f3378' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
+        <var-decl name='SetFloatField' type-id='211caeb7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='310' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3584'>
-        <var-decl name='SetDoubleField' type-id='fcbe15c5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
+        <var-decl name='SetDoubleField' type-id='0408c00e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3616'>
-        <var-decl name='GetStaticMethodID' type-id='7b39afc8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
+        <var-decl name='GetStaticMethodID' type-id='e475bf19' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='313' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3648'>
-        <var-decl name='CallStaticObjectMethod' type-id='260c4c40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
+        <var-decl name='CallStaticObjectMethod' type-id='89b4862b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3680'>
-        <var-decl name='CallStaticObjectMethodV' type-id='775787db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
+        <var-decl name='CallStaticObjectMethodV' type-id='c40ae374' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='316' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3712'>
-        <var-decl name='CallStaticObjectMethodA' type-id='38637da2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
+        <var-decl name='CallStaticObjectMethodA' type-id='99ff6e15' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='317' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3744'>
-        <var-decl name='CallStaticBooleanMethod' type-id='59816c03' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
+        <var-decl name='CallStaticBooleanMethod' type-id='ef643188' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='318' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='CallStaticBooleanMethodV' type-id='46959e4a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
+        <var-decl name='CallStaticBooleanMethodV' type-id='c5b41ba9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='319' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3808'>
-        <var-decl name='CallStaticBooleanMethodA' type-id='4a68d231' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
+        <var-decl name='CallStaticBooleanMethodA' type-id='572f4d46' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='321' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
-        <var-decl name='CallStaticByteMethod' type-id='dbd5502c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
+        <var-decl name='CallStaticByteMethod' type-id='0c9c949f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='322' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3872'>
-        <var-decl name='CallStaticByteMethodV' type-id='4602a027' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
+        <var-decl name='CallStaticByteMethodV' type-id='3ba4d298' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='323' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='CallStaticByteMethodA' type-id='39e07fe6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
+        <var-decl name='CallStaticByteMethodA' type-id='8c288679' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3936'>
-        <var-decl name='CallStaticCharMethod' type-id='7cc5a858' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
+        <var-decl name='CallStaticCharMethod' type-id='f452c4f3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
-        <var-decl name='CallStaticCharMethodV' type-id='8212a383' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
+        <var-decl name='CallStaticCharMethodV' type-id='2370212c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='326' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4000'>
-        <var-decl name='CallStaticCharMethodA' type-id='5316a70a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
+        <var-decl name='CallStaticCharMethodA' type-id='93027c5d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='327' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='CallStaticShortMethod' type-id='4442688b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
+        <var-decl name='CallStaticShortMethod' type-id='322ef220' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='328' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4064'>
-        <var-decl name='CallStaticShortMethodV' type-id='2b6dfd02' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
+        <var-decl name='CallStaticShortMethodV' type-id='34661db1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='329' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4096'>
-        <var-decl name='CallStaticShortMethodA' type-id='8394b669' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
+        <var-decl name='CallStaticShortMethodA' type-id='3b95ca3e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='330' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4128'>
-        <var-decl name='CallStaticIntMethod' type-id='4442688c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
+        <var-decl name='CallStaticIntMethod' type-id='322ef221' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='331' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4160'>
-        <var-decl name='CallStaticIntMethodV' type-id='2b6dfd03' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
+        <var-decl name='CallStaticIntMethodV' type-id='34661db2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='332' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4192'>
-        <var-decl name='CallStaticIntMethodA' type-id='8394b66a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
+        <var-decl name='CallStaticIntMethodA' type-id='3b95ca3f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='333' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='CallStaticLongMethod' type-id='4442688d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
+        <var-decl name='CallStaticLongMethod' type-id='322ef222' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='334' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4256'>
-        <var-decl name='CallStaticLongMethodV' type-id='2b6dfd04' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
+        <var-decl name='CallStaticLongMethodV' type-id='34661db3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='335' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4288'>
-        <var-decl name='CallStaticLongMethodA' type-id='8394b66b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
+        <var-decl name='CallStaticLongMethodA' type-id='3b95ca40' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='336' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4320'>
-        <var-decl name='CallStaticFloatMethod' type-id='b540af52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
+        <var-decl name='CallStaticFloatMethod' type-id='7814c8ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='337' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4352'>
-        <var-decl name='CallStaticFloatMethodV' type-id='aaed3ee1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
+        <var-decl name='CallStaticFloatMethodV' type-id='3f0de1fe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='338' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4384'>
-        <var-decl name='CallStaticFloatMethodA' type-id='e8cbc4c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
+        <var-decl name='CallStaticFloatMethodA' type-id='90e24e07' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='339' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='CallStaticDoubleMethod' type-id='56da0ded' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
+        <var-decl name='CallStaticDoubleMethod' type-id='c9aa1572' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='340' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4448'>
-        <var-decl name='CallStaticDoubleMethodV' type-id='4d96d680' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
+        <var-decl name='CallStaticDoubleMethodV' type-id='397e8683' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='341' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4480'>
-        <var-decl name='CallStaticDoubleMethodA' type-id='fcb05c6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
+        <var-decl name='CallStaticDoubleMethodA' type-id='f1af99f8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='342' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4512'>
-        <var-decl name='CallStaticVoidMethod' type-id='35958544' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
+        <var-decl name='CallStaticVoidMethod' type-id='3d342907' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='343' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4544'>
-        <var-decl name='CallStaticVoidMethodV' type-id='063cc4af' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
+        <var-decl name='CallStaticVoidMethodV' type-id='806c2c50' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='344' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4576'>
-        <var-decl name='CallStaticVoidMethodA' type-id='7399468e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
+        <var-decl name='CallStaticVoidMethodA' type-id='372c8441' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='345' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='GetStaticFieldID' type-id='700bfd71' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
+        <var-decl name='GetStaticFieldID' type-id='234a6cd4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='347' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4640'>
-        <var-decl name='GetStaticObjectField' type-id='4bcddc31' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
+        <var-decl name='GetStaticObjectField' type-id='ccec23f4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4672'>
-        <var-decl name='GetStaticBooleanField' type-id='c61bcf16' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
+        <var-decl name='GetStaticBooleanField' type-id='b6cba737' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='351' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4704'>
-        <var-decl name='GetStaticByteField' type-id='f02d21bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
+        <var-decl name='GetStaticByteField' type-id='1fa86400' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='352' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4736'>
-        <var-decl name='GetStaticCharField' type-id='3a544209' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
+        <var-decl name='GetStaticCharField' type-id='539eccec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='353' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4768'>
-        <var-decl name='GetStaticShortField' type-id='826b5ede' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
+        <var-decl name='GetStaticShortField' type-id='5cd6fe7f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='354' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='GetStaticIntField' type-id='826b5edf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
+        <var-decl name='GetStaticIntField' type-id='5cd6fe80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='355' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4832'>
-        <var-decl name='GetStaticLongField' type-id='826b5ee0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
+        <var-decl name='GetStaticLongField' type-id='5cd6fe81' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='356' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4864'>
-        <var-decl name='GetStaticFloatField' type-id='2525f167' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
+        <var-decl name='GetStaticFloatField' type-id='1dd3489a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='357' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4896'>
-        <var-decl name='GetStaticDoubleField' type-id='8820c0ac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
+        <var-decl name='GetStaticDoubleField' type-id='7c5a95b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='358' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4928'>
-        <var-decl name='SetStaticObjectField' type-id='01a865d1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
+        <var-decl name='SetStaticObjectField' type-id='a479abce' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4960'>
-        <var-decl name='SetStaticBooleanField' type-id='a1ed8fac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
+        <var-decl name='SetStaticBooleanField' type-id='70ef270d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='361' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
-        <var-decl name='SetStaticByteField' type-id='d5efc015' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
+        <var-decl name='SetStaticByteField' type-id='9bda8fea' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5024'>
-        <var-decl name='SetStaticCharField' type-id='400806b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
+        <var-decl name='SetStaticCharField' type-id='05b410f6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='363' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
-        <var-decl name='SetStaticShortField' type-id='48f9101c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
+        <var-decl name='SetStaticShortField' type-id='625ca385' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5088'>
-        <var-decl name='SetStaticIntField' type-id='48f9101d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
+        <var-decl name='SetStaticIntField' type-id='625ca386' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='365' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5120'>
-        <var-decl name='SetStaticLongField' type-id='48f9101e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
+        <var-decl name='SetStaticLongField' type-id='625ca387' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='366' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5152'>
-        <var-decl name='SetStaticFloatField' type-id='192b003b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
+        <var-decl name='SetStaticFloatField' type-id='1171d1b4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='367' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5184'>
-        <var-decl name='SetStaticDoubleField' type-id='6c7c35c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
+        <var-decl name='SetStaticDoubleField' type-id='7c24b203' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5216'>
-        <var-decl name='NewString' type-id='21ec59f0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
+        <var-decl name='NewString' type-id='b2c6c541' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='370' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5248'>
-        <var-decl name='GetStringLength' type-id='814cad27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
+        <var-decl name='GetStringLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='371' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5280'>
-        <var-decl name='GetStringChars' type-id='a4d189fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
+        <var-decl name='GetStringChars' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='372' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5312'>
-        <var-decl name='ReleaseStringChars' type-id='6fd868db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
+        <var-decl name='ReleaseStringChars' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='373' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5344'>
-        <var-decl name='NewStringUTF' type-id='629338b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
+        <var-decl name='NewStringUTF' type-id='a3339ebc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='374' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5376'>
-        <var-decl name='GetStringUTFLength' type-id='814cad27' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
+        <var-decl name='GetStringUTFLength' type-id='1a7dde06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='375' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5408'>
-        <var-decl name='GetStringUTFChars' type-id='653ec4e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
+        <var-decl name='GetStringUTFChars' type-id='4bc76f1c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='377' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5440'>
-        <var-decl name='ReleaseStringUTFChars' type-id='f48e25c1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
+        <var-decl name='ReleaseStringUTFChars' type-id='7c2a9d98' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='378' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5472'>
-        <var-decl name='GetArrayLength' type-id='3c0c03e5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
+        <var-decl name='GetArrayLength' type-id='d57c164e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='379' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5504'>
-        <var-decl name='NewObjectArray' type-id='3a73b9e7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
+        <var-decl name='NewObjectArray' type-id='61b688b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='380' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5536'>
-        <var-decl name='GetObjectArrayElement' type-id='3426ab68' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
+        <var-decl name='GetObjectArrayElement' type-id='9a5725d5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='381' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
-        <var-decl name='SetObjectArrayElement' type-id='177b60ba' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
+        <var-decl name='SetObjectArrayElement' type-id='9b7fadc5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='382' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5600'>
-        <var-decl name='NewBooleanArray' type-id='2ab62f6f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
+        <var-decl name='NewBooleanArray' type-id='8847feac' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='384' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5632'>
-        <var-decl name='NewByteArray' type-id='2dc018ad' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
+        <var-decl name='NewByteArray' type-id='3fcb62e2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='385' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5664'>
-        <var-decl name='NewCharArray' type-id='843cef5f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
+        <var-decl name='NewCharArray' type-id='9a623a5c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5696'>
-        <var-decl name='NewShortArray' type-id='730c485d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
+        <var-decl name='NewShortArray' type-id='86d5bf12' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='387' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5728'>
-        <var-decl name='NewIntArray' type-id='87d7d6ca' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
+        <var-decl name='NewIntArray' type-id='e5fd5491' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5760'>
-        <var-decl name='NewLongArray' type-id='adc7abf9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
+        <var-decl name='NewLongArray' type-id='64c5934e' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5792'>
-        <var-decl name='NewFloatArray' type-id='8fe62605' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
+        <var-decl name='NewFloatArray' type-id='e7cc9f5a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='390' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5824'>
-        <var-decl name='NewDoubleArray' type-id='ef68ddae' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
+        <var-decl name='NewDoubleArray' type-id='452d9f35' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='391' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5856'>
-        <var-decl name='GetBooleanArrayElements' type-id='03556b0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
+        <var-decl name='GetBooleanArrayElements' type-id='affaefeb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='393' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5888'>
-        <var-decl name='GetByteArrayElements' type-id='bec89ede' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
+        <var-decl name='GetByteArrayElements' type-id='2c83c50b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5920'>
-        <var-decl name='GetCharArrayElements' type-id='679b55be' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
+        <var-decl name='GetCharArrayElements' type-id='23f99073' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5952'>
-        <var-decl name='GetShortArrayElements' type-id='80456268' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
+        <var-decl name='GetShortArrayElements' type-id='8fb2e86b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='396' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5984'>
-        <var-decl name='GetIntArrayElements' type-id='7b7de9b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
+        <var-decl name='GetIntArrayElements' type-id='434d567b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='397' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6016'>
-        <var-decl name='GetLongArrayElements' type-id='20c01846' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
+        <var-decl name='GetLongArrayElements' type-id='a5922fa3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6048'>
-        <var-decl name='GetFloatArrayElements' type-id='190d83bc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
+        <var-decl name='GetFloatArrayElements' type-id='9785d58b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6080'>
-        <var-decl name='GetDoubleArrayElements' type-id='8fb656fe' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
+        <var-decl name='GetDoubleArrayElements' type-id='f0c5b475' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6112'>
-        <var-decl name='ReleaseBooleanArrayElements' type-id='69aab5c3' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
+        <var-decl name='ReleaseBooleanArrayElements' type-id='191aba0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='402' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6144'>
-        <var-decl name='ReleaseByteArrayElements' type-id='6d8c64bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
+        <var-decl name='ReleaseByteArrayElements' type-id='34f80e06' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6176'>
-        <var-decl name='ReleaseCharArrayElements' type-id='0f8e37bd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
+        <var-decl name='ReleaseCharArrayElements' type-id='2b0e4ff2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='406' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6208'>
-        <var-decl name='ReleaseShortArrayElements' type-id='89ccc593' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
+        <var-decl name='ReleaseShortArrayElements' type-id='33caa8c4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='408' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6240'>
-        <var-decl name='ReleaseIntArrayElements' type-id='66b73f2f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
+        <var-decl name='ReleaseIntArrayElements' type-id='44f25f18' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='410' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6272'>
-        <var-decl name='ReleaseLongArrayElements' type-id='4ae3250d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
+        <var-decl name='ReleaseLongArrayElements' type-id='b76b1db6' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='412' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6304'>
-        <var-decl name='ReleaseFloatArrayElements' type-id='298dc3b7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
+        <var-decl name='ReleaseFloatArrayElements' type-id='a522e978' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='414' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6336'>
-        <var-decl name='ReleaseDoubleArrayElements' type-id='db388837' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
+        <var-decl name='ReleaseDoubleArrayElements' type-id='f1850b08' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='416' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6368'>
-        <var-decl name='GetBooleanArrayRegion' type-id='fbe0c9de' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
+        <var-decl name='GetBooleanArrayRegion' type-id='a46b0935' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='419' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6400'>
-        <var-decl name='GetByteArrayRegion' type-id='5bf36468' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
+        <var-decl name='GetByteArrayRegion' type-id='f7a0379f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6432'>
-        <var-decl name='GetCharArrayRegion' type-id='730be8b4' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
+        <var-decl name='GetCharArrayRegion' type-id='545a856f' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6464'>
-        <var-decl name='GetShortArrayRegion' type-id='b95eace2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
+        <var-decl name='GetShortArrayRegion' type-id='e1be4c89' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='425' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6496'>
-        <var-decl name='GetIntArrayRegion' type-id='6bc23226' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
+        <var-decl name='GetIntArrayRegion' type-id='792859dd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='427' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6528'>
-        <var-decl name='GetLongArrayRegion' type-id='ad1ea7c0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
+        <var-decl name='GetLongArrayRegion' type-id='1e124adf' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='429' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6560'>
-        <var-decl name='GetFloatArrayRegion' type-id='eb01d38a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
+        <var-decl name='GetFloatArrayRegion' type-id='21f41051' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6592'>
-        <var-decl name='GetDoubleArrayRegion' type-id='fd9a9816' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
+        <var-decl name='GetDoubleArrayRegion' type-id='b251d72d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6624'>
-        <var-decl name='SetBooleanArrayRegion' type-id='08a2f0e1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
+        <var-decl name='SetBooleanArrayRegion' type-id='f51198ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6656'>
-        <var-decl name='SetByteArrayRegion' type-id='3b7e394d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
+        <var-decl name='SetByteArrayRegion' type-id='81c03d6c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='439' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6688'>
-        <var-decl name='SetCharArrayRegion' type-id='dc329231' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
+        <var-decl name='SetCharArrayRegion' type-id='e08d371c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='441' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6720'>
-        <var-decl name='SetShortArrayRegion' type-id='5fc46b11' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
+        <var-decl name='SetShortArrayRegion' type-id='82203b3c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='443' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6752'>
-        <var-decl name='SetIntArrayRegion' type-id='fa46db69' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
+        <var-decl name='SetIntArrayRegion' type-id='2ccb7754' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6784'>
-        <var-decl name='SetLongArrayRegion' type-id='ebf40e2d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
+        <var-decl name='SetLongArrayRegion' type-id='c1bcf4ec' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='447' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6816'>
-        <var-decl name='SetFloatArrayRegion' type-id='9990734d' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
+        <var-decl name='SetFloatArrayRegion' type-id='950241b0' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6848'>
-        <var-decl name='SetDoubleArrayRegion' type-id='977cec7b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
+        <var-decl name='SetDoubleArrayRegion' type-id='a733b71a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='451' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6880'>
-        <var-decl name='RegisterNatives' type-id='dfa383fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
+        <var-decl name='RegisterNatives' type-id='0c62a17c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6912'>
-        <var-decl name='UnregisterNatives' type-id='55811db2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
+        <var-decl name='UnregisterNatives' type-id='41173bbb' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='456' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6944'>
-        <var-decl name='MonitorEnter' type-id='7a154085' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
+        <var-decl name='MonitorEnter' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='457' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='MonitorExit' type-id='7a154085' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
+        <var-decl name='MonitorExit' type-id='0dbd0b28' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7008'>
-        <var-decl name='GetJavaVM' type-id='a65198e8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
+        <var-decl name='GetJavaVM' type-id='19620ff1' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='459' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='GetStringRegion' type-id='7a8e54fc' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
+        <var-decl name='GetStringRegion' type-id='bd3e8fb9' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7072'>
-        <var-decl name='GetStringUTFRegion' type-id='0a719884' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
+        <var-decl name='GetStringUTFRegion' type-id='0c1914a7' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7104'>
-        <var-decl name='GetPrimitiveArrayCritical' type-id='101b8c80' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
+        <var-decl name='GetPrimitiveArrayCritical' type-id='32c7d509' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='464' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7136'>
-        <var-decl name='ReleasePrimitiveArrayCritical' type-id='4382c817' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
+        <var-decl name='ReleasePrimitiveArrayCritical' type-id='bf254042' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='465' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7168'>
-        <var-decl name='GetStringCritical' type-id='a4d189fd' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
+        <var-decl name='GetStringCritical' type-id='fff004b2' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='467' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7200'>
-        <var-decl name='ReleaseStringCritical' type-id='6fd868db' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
+        <var-decl name='ReleaseStringCritical' type-id='c05a64c8' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='468' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7232'>
-        <var-decl name='NewWeakGlobalRef' type-id='f2a57148' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
+        <var-decl name='NewWeakGlobalRef' type-id='e8d65641' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7264'>
-        <var-decl name='DeleteWeakGlobalRef' type-id='43af461c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
+        <var-decl name='DeleteWeakGlobalRef' type-id='f34f71b5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='471' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7296'>
-        <var-decl name='ExceptionCheck' type-id='22b63871' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
+        <var-decl name='ExceptionCheck' type-id='c6d2cb52' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='473' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7328'>
-        <var-decl name='NewDirectByteBuffer' type-id='e8dccc6b' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
+        <var-decl name='NewDirectByteBuffer' type-id='ad0b765a' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='475' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7360'>
-        <var-decl name='GetDirectBufferAddress' type-id='4db2cf0c' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
+        <var-decl name='GetDirectBufferAddress' type-id='23103ee5' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='476' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7392'>
-        <var-decl name='GetDirectBufferCapacity' type-id='7a154086' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
+        <var-decl name='GetDirectBufferCapacity' type-id='0dbd0b29' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='477' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7424'>
-        <var-decl name='GetObjectRefType' type-id='ddfe5d59' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
+        <var-decl name='GetObjectRefType' type-id='3f4a2861' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='480' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='_JNIEnv' size-in-bits='32' is-struct='yes' visibility='default' filepath='libnativehelper/include_jni/jni.h' line='489' column='1' id='c9459134'>
@@ -4470,7 +4470,7 @@
     <qualified-type-def type-id='a84c031d' const='yes' id='9b45d938'/>
     <reference-type-def kind='lvalue' type-id='9b45d938' size-in-bits='32' id='8cf4ca3a'/>
     <pointer-type-def type-id='9b45d938' size-in-bits='32' id='80f4b756'/>
-    <pointer-type-def type-id='4693c583' size-in-bits='32' id='653ec4e7'/>
+    <pointer-type-def type-id='4693c583' size-in-bits='32' id='4bc76f1c'/>
     <pointer-type-def type-id='80f4b756' size-in-bits='32' id='7d3cd834'/>
     <qualified-type-def type-id='801a266d' const='yes' id='e7c31614'/>
     <reference-type-def kind='lvalue' type-id='e7c31614' size-in-bits='32' id='0a1bf0b6'/>
@@ -4490,7 +4490,7 @@
     <pointer-type-def type-id='3ebf19c8' size-in-bits='32' id='a8d5bec6'/>
     <qualified-type-def type-id='8dfe2e06' const='yes' id='9bf2d596'/>
     <pointer-type-def type-id='9bf2d596' size-in-bits='32' id='3b4676f4'/>
-    <pointer-type-def type-id='6a9e3459' size-in-bits='32' id='a4d189fd'/>
+    <pointer-type-def type-id='6a9e3459' size-in-bits='32' id='fff004b2'/>
     <qualified-type-def type-id='973e3c3f' const='yes' id='8bac99cf'/>
     <pointer-type-def type-id='8bac99cf' size-in-bits='32' id='c5b6437f'/>
     <qualified-type-def type-id='1a7fe6b0' const='yes' id='af8c6a20'/>
@@ -5108,28 +5108,169 @@
     <reference-type-def kind='lvalue' type-id='a6c45d85' size-in-bits='32' id='2a1f6799'/>
     <pointer-type-def type-id='a6c45d85' size-in-bits='32' id='361f7a7d'/>
     <pointer-type-def type-id='e322b6ef' size-in-bits='32' id='c5f12884'/>
-    <pointer-type-def type-id='96ee24a5' size-in-bits='32' id='585e1de9'/>
+    <pointer-type-def type-id='96ee24a5' size-in-bits='32' id='67230494'/>
     <reference-type-def kind='lvalue' type-id='95e97e5e' size-in-bits='32' id='769216e8'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='32' id='7292109c'/>
     <qualified-type-def type-id='7292109c' const='yes' id='5a5c0787'/>
     <reference-type-def kind='lvalue' type-id='5a5c0787' size-in-bits='32' id='dfe00273'/>
     <reference-type-def kind='lvalue' type-id='7292109c' size-in-bits='32' id='15f054ce'/>
+    <pointer-type-def type-id='c2ab665d' size-in-bits='32' id='c6d2cb52'/>
+    <pointer-type-def type-id='ca1de4b9' size-in-bits='32' id='f42dbf4e'/>
+    <pointer-type-def type-id='6f7cb7b4' size-in-bits='32' id='b6cba737'/>
+    <pointer-type-def type-id='9d54666b' size-in-bits='32' id='ef643188'/>
+    <pointer-type-def type-id='eda358d5' size-in-bits='32' id='572f4d46'/>
+    <pointer-type-def type-id='fe376334' size-in-bits='32' id='c5b41ba9'/>
+    <pointer-type-def type-id='2207a1d4' size-in-bits='32' id='af9b66a1'/>
+    <pointer-type-def type-id='ec86bf87' size-in-bits='32' id='70076aa2'/>
+    <pointer-type-def type-id='b3920ec1' size-in-bits='32' id='fdb6d1a8'/>
+    <pointer-type-def type-id='d44533d0' size-in-bits='32' id='f7295393'/>
+    <pointer-type-def type-id='635e0a25' size-in-bits='32' id='8c01ad3c'/>
+    <pointer-type-def type-id='161aeec2' size-in-bits='32' id='c5017f63'/>
+    <pointer-type-def type-id='40138048' size-in-bits='32' id='286a904d'/>
+    <pointer-type-def type-id='f1f2c7f3' size-in-bits='32' id='9b7e723c'/>
+    <pointer-type-def type-id='6a7bb135' size-in-bits='32' id='d2595e76'/>
     <pointer-type-def type-id='cc6e09ca' size-in-bits='32' id='d4a328b7'/>
-    <pointer-type-def type-id='1704c89a' size-in-bits='32' id='03556b0c'/>
+    <pointer-type-def type-id='1704c89a' size-in-bits='32' id='affaefeb'/>
+    <pointer-type-def type-id='72c33ddb' size-in-bits='32' id='8847feac'/>
+    <pointer-type-def type-id='76032d71' size-in-bits='32' id='1fa86400'/>
+    <pointer-type-def type-id='47ca8d46' size-in-bits='32' id='0c9c949f'/>
+    <pointer-type-def type-id='36acdbcc' size-in-bits='32' id='8c288679'/>
+    <pointer-type-def type-id='c1b550c7' size-in-bits='32' id='3ba4d298'/>
+    <pointer-type-def type-id='3c662e98' size-in-bits='32' id='b90b8f9b'/>
+    <pointer-type-def type-id='8ae90496' size-in-bits='32' id='72aad4c5'/>
+    <pointer-type-def type-id='d35f73d9' size-in-bits='32' id='19e79f04'/>
+    <pointer-type-def type-id='d6f3cc1e' size-in-bits='32' id='11c5f5c9'/>
+    <pointer-type-def type-id='521af3a9' size-in-bits='32' id='a6e4e20e'/>
+    <pointer-type-def type-id='4aa4e453' size-in-bits='32' id='7e64ceb4'/>
+    <pointer-type-def type-id='b062a33a' size-in-bits='32' id='b73332bf'/>
     <pointer-type-def type-id='adf18958' size-in-bits='32' id='a6979e77'/>
-    <pointer-type-def type-id='c6492f6c' size-in-bits='32' id='bec89ede'/>
+    <pointer-type-def type-id='c6492f6c' size-in-bits='32' id='2c83c50b'/>
+    <pointer-type-def type-id='23a084d1' size-in-bits='32' id='3fcb62e2'/>
+    <pointer-type-def type-id='1c231d7d' size-in-bits='32' id='539eccec'/>
+    <pointer-type-def type-id='c60ec5ea' size-in-bits='32' id='f452c4f3'/>
+    <pointer-type-def type-id='63e40290' size-in-bits='32' id='93027c5d'/>
+    <pointer-type-def type-id='b58a040b' size-in-bits='32' id='2370212c'/>
+    <pointer-type-def type-id='c71e554c' size-in-bits='32' id='3f53351f'/>
+    <pointer-type-def type-id='48a0988a' size-in-bits='32' id='de836af9'/>
+    <pointer-type-def type-id='4543f86d' size-in-bits='32' id='60ba8818'/>
+    <pointer-type-def type-id='024b2e02' size-in-bits='32' id='340bfd9d'/>
+    <pointer-type-def type-id='72b5ef45' size-in-bits='32' id='abb6ff0a'/>
+    <pointer-type-def type-id='4d6cc7ff' size-in-bits='32' id='18ca9f30'/>
+    <pointer-type-def type-id='171c33c6' size-in-bits='32' id='3940caeb'/>
     <pointer-type-def type-id='8dfe2e06' size-in-bits='32' id='071e4e5d'/>
-    <pointer-type-def type-id='062cf4ec' size-in-bits='32' id='679b55be'/>
+    <pointer-type-def type-id='062cf4ec' size-in-bits='32' id='23f99073'/>
+    <pointer-type-def type-id='2362799b' size-in-bits='32' id='9a623a5c'/>
+    <pointer-type-def type-id='e7767992' size-in-bits='32' id='2b174cab'/>
+    <pointer-type-def type-id='6b5969a6' size-in-bits='32' id='30ee23e3'/>
+    <pointer-type-def type-id='41d77b1c' size-in-bits='32' id='a96e9567'/>
+    <pointer-type-def type-id='541d431d' size-in-bits='32' id='15829ccc'/>
+    <pointer-type-def type-id='0fbe2cda' size-in-bits='32' id='7c5a95b5'/>
+    <pointer-type-def type-id='1ce8356d' size-in-bits='32' id='c9aa1572'/>
+    <pointer-type-def type-id='0257c247' size-in-bits='32' id='f1af99f8'/>
+    <pointer-type-def type-id='9f8e2b3e' size-in-bits='32' id='397e8683'/>
+    <pointer-type-def type-id='5c9d1bb1' size-in-bits='32' id='7c6967e4'/>
+    <pointer-type-def type-id='7cc5073b' size-in-bits='32' id='9aee4982'/>
+    <pointer-type-def type-id='f6f688b2' size-in-bits='32' id='06674af5'/>
+    <pointer-type-def type-id='9ee61f63' size-in-bits='32' id='3d49369a'/>
+    <pointer-type-def type-id='47aa8c3c' size-in-bits='32' id='e06b46ad'/>
+    <pointer-type-def type-id='6b33627a' size-in-bits='32' id='0aafbc07'/>
+    <pointer-type-def type-id='039aab3d' size-in-bits='32' id='fd720bfe'/>
     <pointer-type-def type-id='973e3c3f' size-in-bits='32' id='6292c81e'/>
-    <pointer-type-def type-id='1b2606fc' size-in-bits='32' id='8fb656fe'/>
+    <pointer-type-def type-id='1b2606fc' size-in-bits='32' id='f0c5b475'/>
+    <pointer-type-def type-id='b5b9ed34' size-in-bits='32' id='452d9f35'/>
+    <pointer-type-def type-id='74c6e66d' size-in-bits='32' id='234a6cd4'/>
+    <pointer-type-def type-id='18f35374' size-in-bits='32' id='6098e447'/>
+    <pointer-type-def type-id='3ed49d13' size-in-bits='32' id='1dd3489a'/>
+    <pointer-type-def type-id='c3f30acc' size-in-bits='32' id='7814c8ad'/>
+    <pointer-type-def type-id='2baaba0a' size-in-bits='32' id='90e24e07'/>
+    <pointer-type-def type-id='2e36b4ed' size-in-bits='32' id='3f0de1fe'/>
+    <pointer-type-def type-id='14209476' size-in-bits='32' id='bec66371'/>
+    <pointer-type-def type-id='06dcb13c' size-in-bits='32' id='f1447c7b'/>
+    <pointer-type-def type-id='672db497' size-in-bits='32' id='43ae4cf2'/>
+    <pointer-type-def type-id='7f8c4cf0' size-in-bits='32' id='bae7b123'/>
+    <pointer-type-def type-id='28a5f5af' size-in-bits='32' id='29b6037c'/>
+    <pointer-type-def type-id='89a65589' size-in-bits='32' id='154c703a'/>
+    <pointer-type-def type-id='94426c08' size-in-bits='32' id='e91668fd'/>
     <pointer-type-def type-id='1a7fe6b0' size-in-bits='32' id='d8263a65'/>
-    <pointer-type-def type-id='1c8e3a5a' size-in-bits='32' id='190d83bc'/>
+    <pointer-type-def type-id='1c8e3a5a' size-in-bits='32' id='9785d58b'/>
+    <pointer-type-def type-id='5321e7f1' size-in-bits='32' id='e7cc9f5a'/>
+    <pointer-type-def type-id='f68d4a05' size-in-bits='32' id='f3fd167a'/>
+    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' id='19620ff1'/>
+    <pointer-type-def type-id='b02c2550' size-in-bits='32' id='41173bbb'/>
+    <pointer-type-def type-id='eb909c09' size-in-bits='32' id='0c62a17c'/>
+    <pointer-type-def type-id='46353f35' size-in-bits='32' id='bbfa68cc'/>
+    <pointer-type-def type-id='ccb79e1c' size-in-bits='32' id='5cd6fe80'/>
+    <pointer-type-def type-id='69749343' size-in-bits='32' id='322ef221'/>
+    <pointer-type-def type-id='846957ad' size-in-bits='32' id='3b95ca3f'/>
+    <pointer-type-def type-id='ae98ce5c' size-in-bits='32' id='34661db2'/>
+    <pointer-type-def type-id='49080c66' size-in-bits='32' id='e459a6af'/>
+    <pointer-type-def type-id='e375f1d9' size-in-bits='32' id='0dbd0b28'/>
+    <pointer-type-def type-id='8ae4e70f' size-in-bits='32' id='bd2b792b'/>
+    <pointer-type-def type-id='09e3e169' size-in-bits='32' id='51953751'/>
+    <pointer-type-def type-id='f44a3fa8' size-in-bits='32' id='5f5d06cc'/>
+    <pointer-type-def type-id='02d5f98d' size-in-bits='32' id='e3d72665'/>
+    <pointer-type-def type-id='8f0b7f5a' size-in-bits='32' id='0f8d5f3c'/>
+    <pointer-type-def type-id='9454c680' size-in-bits='32' id='7b6e1be6'/>
+    <pointer-type-def type-id='292a411b' size-in-bits='32' id='1c93d4e5'/>
+    <pointer-type-def type-id='1461dd30' size-in-bits='32' id='797bd39f'/>
     <pointer-type-def type-id='0b9c02cb' size-in-bits='32' id='7f83e8c4'/>
-    <pointer-type-def type-id='3aff0b18' size-in-bits='32' id='7b7de9b2'/>
+    <pointer-type-def type-id='3aff0b18' size-in-bits='32' id='434d567b'/>
+    <pointer-type-def type-id='7343f038' size-in-bits='32' id='e5fd5491'/>
+    <pointer-type-def type-id='ccb79e1d' size-in-bits='32' id='5cd6fe81'/>
+    <pointer-type-def type-id='69749344' size-in-bits='32' id='322ef222'/>
+    <pointer-type-def type-id='846957ae' size-in-bits='32' id='3b95ca40'/>
+    <pointer-type-def type-id='ae98ce5d' size-in-bits='32' id='34661db3'/>
+    <pointer-type-def type-id='e375f1da' size-in-bits='32' id='0dbd0b29'/>
+    <pointer-type-def type-id='8ae4e710' size-in-bits='32' id='bd2b792c'/>
+    <pointer-type-def type-id='09e3e16a' size-in-bits='32' id='51953752'/>
+    <pointer-type-def type-id='f44a3fa9' size-in-bits='32' id='5f5d06cd'/>
+    <pointer-type-def type-id='02d5f98e' size-in-bits='32' id='e3d72666'/>
+    <pointer-type-def type-id='8f0b7f5b' size-in-bits='32' id='0f8d5f3d'/>
+    <pointer-type-def type-id='9454c681' size-in-bits='32' id='7b6e1be7'/>
+    <pointer-type-def type-id='292a411c' size-in-bits='32' id='1c93d4e6'/>
     <pointer-type-def type-id='c8745fdc' size-in-bits='32' id='c2fb5303'/>
-    <pointer-type-def type-id='f669f224' size-in-bits='32' id='20c01846'/>
+    <pointer-type-def type-id='f669f224' size-in-bits='32' id='a5922fa3'/>
+    <pointer-type-def type-id='9da94b15' size-in-bits='32' id='64c5934e'/>
+    <pointer-type-def type-id='2fe17cde' size-in-bits='32' id='e475bf19'/>
+    <pointer-type-def type-id='2b6522f1' size-in-bits='32' id='70351828'/>
+    <pointer-type-def type-id='d5b15e49' size-in-bits='32' id='2365fdd8'/>
+    <pointer-type-def type-id='a77026dd' size-in-bits='32' id='ccec23f4'/>
+    <pointer-type-def type-id='4c6da22e' size-in-bits='32' id='7bbfad59'/>
+    <pointer-type-def type-id='54e064ca' size-in-bits='32' id='89b4862b'/>
+    <pointer-type-def type-id='4aacf270' size-in-bits='32' id='99ff6e15'/>
+    <pointer-type-def type-id='357daae3' size-in-bits='32' id='0e7dc576'/>
+    <pointer-type-def type-id='ba3ff62b' size-in-bits='32' id='c40ae374'/>
+    <pointer-type-def type-id='39763bbe' size-in-bits='32' id='e8d65641'/>
+    <pointer-type-def type-id='655c526c' size-in-bits='32' id='87683ec7'/>
+    <pointer-type-def type-id='392f372a' size-in-bits='32' id='c8123d81'/>
+    <pointer-type-def type-id='2afd2d4d' size-in-bits='32' id='5debed90'/>
+    <pointer-type-def type-id='93d80062' size-in-bits='32' id='21976f65'/>
+    <pointer-type-def type-id='d24762a5' size-in-bits='32' id='38711a82'/>
+    <pointer-type-def type-id='92fdb75f' size-in-bits='32' id='ff005e88'/>
+    <pointer-type-def type-id='cc93eb66' size-in-bits='32' id='4025b733'/>
+    <pointer-type-def type-id='cf650c06' size-in-bits='32' id='9a5725d5'/>
+    <pointer-type-def type-id='f74edd67' size-in-bits='32' id='ad0b765a'/>
+    <pointer-type-def type-id='bb3a3bd3' size-in-bits='32' id='61b688b0'/>
+    <pointer-type-def type-id='4861351d' size-in-bits='32' id='3f4a2861'/>
+    <pointer-type-def type-id='ccb79e1e' size-in-bits='32' id='5cd6fe7f'/>
+    <pointer-type-def type-id='69749345' size-in-bits='32' id='322ef220'/>
+    <pointer-type-def type-id='846957af' size-in-bits='32' id='3b95ca3e'/>
+    <pointer-type-def type-id='ae98ce5e' size-in-bits='32' id='34661db1'/>
+    <pointer-type-def type-id='8ae4e711' size-in-bits='32' id='bd2b792a'/>
+    <pointer-type-def type-id='09e3e16b' size-in-bits='32' id='51953750'/>
+    <pointer-type-def type-id='f44a3faa' size-in-bits='32' id='5f5d06cb'/>
+    <pointer-type-def type-id='02d5f98f' size-in-bits='32' id='e3d72664'/>
+    <pointer-type-def type-id='8f0b7f5c' size-in-bits='32' id='0f8d5f3b'/>
+    <pointer-type-def type-id='9454c682' size-in-bits='32' id='7b6e1be5'/>
+    <pointer-type-def type-id='292a411d' size-in-bits='32' id='1c93d4e4'/>
     <pointer-type-def type-id='9a10f134' size-in-bits='32' id='aa210e95'/>
-    <pointer-type-def type-id='31804c0e' size-in-bits='32' id='80456268'/>
+    <pointer-type-def type-id='31804c0e' size-in-bits='32' id='8fb2e86b'/>
+    <pointer-type-def type-id='9dcf39b9' size-in-bits='32' id='86d5bf12'/>
+    <pointer-type-def type-id='060737b9' size-in-bits='32' id='d57c164e'/>
+    <pointer-type-def type-id='3ccdd9d3' size-in-bits='32' id='1a7dde06'/>
+    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' id='a3339ebc'/>
+    <pointer-type-def type-id='a6863c16' size-in-bits='32' id='b2c6c541'/>
+    <pointer-type-def type-id='e13d7981' size-in-bits='32' id='a8a22fa6'/>
     <pointer-type-def type-id='a0eb0f09' size-in-bits='32' id='7408d286'/>
     <pointer-type-def type-id='3d7d8cbf' size-in-bits='32' id='a68021ce'/>
     <pointer-type-def type-id='05d4c620' size-in-bits='32' id='b8263143'/>
@@ -5594,215 +5735,74 @@
     <pointer-type-def type-id='62e477b5' size-in-bits='32' id='e8fa266e'/>
     <pointer-type-def type-id='c9d12d66' size-in-bits='32' id='b2eb2c3f'/>
     <pointer-type-def type-id='dddf6ca2' size-in-bits='32' id='d915a820'/>
-    <pointer-type-def type-id='c2ab665d' size-in-bits='32' id='22b63871'/>
-    <pointer-type-def type-id='ca1de4b9' size-in-bits='32' id='192dd735'/>
-    <pointer-type-def type-id='6f7cb7b4' size-in-bits='32' id='c61bcf16'/>
-    <pointer-type-def type-id='eda358d5' size-in-bits='32' id='4a68d231'/>
-    <pointer-type-def type-id='84f1ec00' size-in-bits='32' id='46959e4a'/>
-    <pointer-type-def type-id='357a5107' size-in-bits='32' id='59816c03'/>
-    <pointer-type-def type-id='2207a1d4' size-in-bits='32' id='bfafe7be'/>
-    <pointer-type-def type-id='b3920ec1' size-in-bits='32' id='632958b5'/>
-    <pointer-type-def type-id='dbddeaa4' size-in-bits='32' id='5502cec6'/>
-    <pointer-type-def type-id='dce8633b' size-in-bits='32' id='911bafcf'/>
-    <pointer-type-def type-id='635e0a25' size-in-bits='32' id='afd19731'/>
-    <pointer-type-def type-id='40138048' size-in-bits='32' id='fb4bf8a2'/>
-    <pointer-type-def type-id='ffceb0d7' size-in-bits='32' id='f47c20db'/>
-    <pointer-type-def type-id='118a7d6e' size-in-bits='32' id='dcc01f40'/>
-    <pointer-type-def type-id='6a7bb135' size-in-bits='32' id='00722fb9'/>
-    <pointer-type-def type-id='72c33ddb' size-in-bits='32' id='2ab62f6f'/>
-    <pointer-type-def type-id='76032d71' size-in-bits='32' id='f02d21bd'/>
-    <pointer-type-def type-id='36acdbcc' size-in-bits='32' id='39e07fe6'/>
-    <pointer-type-def type-id='ffadf963' size-in-bits='32' id='4602a027'/>
-    <pointer-type-def type-id='1e23d39a' size-in-bits='32' id='dbd5502c'/>
-    <pointer-type-def type-id='8ae90496' size-in-bits='32' id='3f53da28'/>
-    <pointer-type-def type-id='7c58e9c1' size-in-bits='32' id='ac33c16d'/>
-    <pointer-type-def type-id='9f92723c' size-in-bits='32' id='c5080c6e'/>
-    <pointer-type-def type-id='d6f3cc1e' size-in-bits='32' id='be83b1c0'/>
-    <pointer-type-def type-id='4aa4e453' size-in-bits='32' id='bd039867'/>
-    <pointer-type-def type-id='aa966e7a' size-in-bits='32' id='8e395004'/>
-    <pointer-type-def type-id='60d09265' size-in-bits='32' id='b8872911'/>
-    <pointer-type-def type-id='23a084d1' size-in-bits='32' id='2dc018ad'/>
-    <pointer-type-def type-id='1c231d7d' size-in-bits='32' id='3a544209'/>
-    <pointer-type-def type-id='63e40290' size-in-bits='32' id='5316a70a'/>
-    <pointer-type-def type-id='234ebc1f' size-in-bits='32' id='8212a383'/>
-    <pointer-type-def type-id='a3568ec6' size-in-bits='32' id='7cc5a858'/>
-    <pointer-type-def type-id='48a0988a' size-in-bits='32' id='429f83fc'/>
-    <pointer-type-def type-id='b6337d2d' size-in-bits='32' id='e202bf99'/>
-    <pointer-type-def type-id='aef1d658' size-in-bits='32' id='d3d606ba'/>
-    <pointer-type-def type-id='024b2e02' size-in-bits='32' id='5b2401a4'/>
-    <pointer-type-def type-id='4d6cc7ff' size-in-bits='32' id='75022493'/>
-    <pointer-type-def type-id='82e9406e' size-in-bits='32' id='e6cee188'/>
-    <pointer-type-def type-id='32dce039' size-in-bits='32' id='276929e5'/>
-    <pointer-type-def type-id='2362799b' size-in-bits='32' id='843cef5f'/>
-    <pointer-type-def type-id='e7767992' size-in-bits='32' id='a247d414'/>
-    <pointer-type-def type-id='6b5969a6' size-in-bits='32' id='c1bcbe60'/>
-    <pointer-type-def type-id='41d77b1c' size-in-bits='32' id='61e793ce'/>
-    <pointer-type-def type-id='541d431d' size-in-bits='32' id='f50e7349'/>
-    <pointer-type-def type-id='0fbe2cda' size-in-bits='32' id='8820c0ac'/>
-    <pointer-type-def type-id='0257c247' size-in-bits='32' id='fcb05c6b'/>
-    <pointer-type-def type-id='9665bdb6' size-in-bits='32' id='4d96d680'/>
-    <pointer-type-def type-id='66488491' size-in-bits='32' id='56da0ded'/>
-    <pointer-type-def type-id='7cc5073b' size-in-bits='32' id='06ef81e7'/>
-    <pointer-type-def type-id='a3c89a22' size-in-bits='32' id='57f14084'/>
-    <pointer-type-def type-id='028fa27d' size-in-bits='32' id='81941e91'/>
-    <pointer-type-def type-id='9ee61f63' size-in-bits='32' id='a737306f'/>
-    <pointer-type-def type-id='6b33627a' size-in-bits='32' id='cce2541c'/>
-    <pointer-type-def type-id='50f8d93d' size-in-bits='32' id='061addf9'/>
-    <pointer-type-def type-id='76a432e8' size-in-bits='32' id='1358cb5a'/>
-    <pointer-type-def type-id='b5b9ed34' size-in-bits='32' id='ef68ddae'/>
-    <pointer-type-def type-id='74c6e66d' size-in-bits='32' id='700bfd71'/>
-    <pointer-type-def type-id='18f35374' size-in-bits='32' id='2c8531ee'/>
-    <pointer-type-def type-id='3ed49d13' size-in-bits='32' id='2525f167'/>
-    <pointer-type-def type-id='2baaba0a' size-in-bits='32' id='e8cbc4c4'/>
-    <pointer-type-def type-id='14ac55ad' size-in-bits='32' id='aaed3ee1'/>
-    <pointer-type-def type-id='5ebac3d8' size-in-bits='32' id='b540af52'/>
-    <pointer-type-def type-id='06dcb13c' size-in-bits='32' id='34d95ce6'/>
-    <pointer-type-def type-id='eb1675b3' size-in-bits='32' id='286f4f27'/>
-    <pointer-type-def type-id='129c82ea' size-in-bits='32' id='6a09952c'/>
-    <pointer-type-def type-id='7f8c4cf0' size-in-bits='32' id='45f30d62'/>
-    <pointer-type-def type-id='89a65589' size-in-bits='32' id='81649ee5'/>
-    <pointer-type-def type-id='263f3dcc' size-in-bits='32' id='a1d47c16'/>
-    <pointer-type-def type-id='047ae073' size-in-bits='32' id='9f5f6d1f'/>
-    <pointer-type-def type-id='5321e7f1' size-in-bits='32' id='8fe62605'/>
-    <pointer-type-def type-id='f68d4a05' size-in-bits='32' id='18d755d9'/>
-    <pointer-type-def type-id='2fb8ba3e' size-in-bits='32' id='a65198e8'/>
-    <pointer-type-def type-id='b02c2550' size-in-bits='32' id='55811db2'/>
-    <pointer-type-def type-id='eb909c09' size-in-bits='32' id='dfa383fd'/>
-    <pointer-type-def type-id='46353f35' size-in-bits='32' id='98515169'/>
-    <pointer-type-def type-id='ccb79e1c' size-in-bits='32' id='826b5edf'/>
-    <pointer-type-def type-id='846957ad' size-in-bits='32' id='8394b66a'/>
-    <pointer-type-def type-id='2f3e7a58' size-in-bits='32' id='2b6dfd03'/>
-    <pointer-type-def type-id='e8eab40f' size-in-bits='32' id='4442688c'/>
-    <pointer-type-def type-id='49080c66' size-in-bits='32' id='8770ee20'/>
-    <pointer-type-def type-id='e375f1d9' size-in-bits='32' id='7a154085'/>
-    <pointer-type-def type-id='09e3e169' size-in-bits='32' id='5b8df47e'/>
-    <pointer-type-def type-id='d5e4d4ec' size-in-bits='32' id='5b336a8f'/>
-    <pointer-type-def type-id='1bb86c53' size-in-bits='32' id='cab20a88'/>
-    <pointer-type-def type-id='02d5f98d' size-in-bits='32' id='d9547e1a'/>
-    <pointer-type-def type-id='9454c680' size-in-bits='32' id='4ed5bc7b'/>
-    <pointer-type-def type-id='a84589af' size-in-bits='32' id='4ab10d54'/>
-    <pointer-type-def type-id='86f41856' size-in-bits='32' id='9f2ec5e9'/>
-    <pointer-type-def type-id='1461dd30' size-in-bits='32' id='c8a34da2'/>
-    <pointer-type-def type-id='7343f038' size-in-bits='32' id='87d7d6ca'/>
-    <pointer-type-def type-id='ccb79e1d' size-in-bits='32' id='826b5ee0'/>
-    <pointer-type-def type-id='846957ae' size-in-bits='32' id='8394b66b'/>
-    <pointer-type-def type-id='2f3e7a59' size-in-bits='32' id='2b6dfd04'/>
-    <pointer-type-def type-id='e8eab410' size-in-bits='32' id='4442688d'/>
-    <pointer-type-def type-id='e375f1da' size-in-bits='32' id='7a154086'/>
-    <pointer-type-def type-id='09e3e16a' size-in-bits='32' id='5b8df47f'/>
-    <pointer-type-def type-id='d5e4d4ed' size-in-bits='32' id='5b336a90'/>
-    <pointer-type-def type-id='1bb86c54' size-in-bits='32' id='cab20a89'/>
-    <pointer-type-def type-id='02d5f98e' size-in-bits='32' id='d9547e1b'/>
-    <pointer-type-def type-id='9454c681' size-in-bits='32' id='4ed5bc7c'/>
-    <pointer-type-def type-id='a84589b0' size-in-bits='32' id='4ab10d55'/>
-    <pointer-type-def type-id='86f41857' size-in-bits='32' id='9f2ec5ea'/>
-    <pointer-type-def type-id='9da94b15' size-in-bits='32' id='adc7abf9'/>
-    <pointer-type-def type-id='2fe17cde' size-in-bits='32' id='7b39afc8'/>
-    <pointer-type-def type-id='2b6522f1' size-in-bits='32' id='95094585'/>
-    <pointer-type-def type-id='d5b15e49' size-in-bits='32' id='32aa4f8d'/>
-    <pointer-type-def type-id='a77026dd' size-in-bits='32' id='4bcddc31'/>
-    <pointer-type-def type-id='4c6da22e' size-in-bits='32' id='d17c3f88'/>
-    <pointer-type-def type-id='4aacf270' size-in-bits='32' id='38637da2'/>
-    <pointer-type-def type-id='357daae3' size-in-bits='32' id='a19c74f7'/>
-    <pointer-type-def type-id='582752bf' size-in-bits='32' id='775787db'/>
-    <pointer-type-def type-id='08ced926' size-in-bits='32' id='260c4c40'/>
-    <pointer-type-def type-id='39763bbe' size-in-bits='32' id='f2a57148'/>
-    <pointer-type-def type-id='392f372a' size-in-bits='32' id='75e166e4'/>
-    <pointer-type-def type-id='8a107f0d' size-in-bits='32' id='671a4cc1'/>
-    <pointer-type-def type-id='08cb7a78' size-in-bits='32' id='36fdf2f2'/>
-    <pointer-type-def type-id='93d80062' size-in-bits='32' id='676c304c'/>
-    <pointer-type-def type-id='92fdb75f' size-in-bits='32' id='d469a98b'/>
-    <pointer-type-def type-id='1a60c48e' size-in-bits='32' id='e2a33260'/>
-    <pointer-type-def type-id='7c644d19' size-in-bits='32' id='ceea3b8d'/>
-    <pointer-type-def type-id='cf650c06' size-in-bits='32' id='3426ab68'/>
-    <pointer-type-def type-id='f74edd67' size-in-bits='32' id='e8dccc6b'/>
-    <pointer-type-def type-id='bb3a3bd3' size-in-bits='32' id='3a73b9e7'/>
-    <pointer-type-def type-id='4861351d' size-in-bits='32' id='ddfe5d59'/>
-    <pointer-type-def type-id='ccb79e1e' size-in-bits='32' id='826b5ede'/>
-    <pointer-type-def type-id='846957af' size-in-bits='32' id='8394b669'/>
-    <pointer-type-def type-id='2f3e7a5a' size-in-bits='32' id='2b6dfd02'/>
-    <pointer-type-def type-id='e8eab411' size-in-bits='32' id='4442688b'/>
-    <pointer-type-def type-id='09e3e16b' size-in-bits='32' id='5b8df47d'/>
-    <pointer-type-def type-id='d5e4d4ee' size-in-bits='32' id='5b336a8e'/>
-    <pointer-type-def type-id='1bb86c55' size-in-bits='32' id='cab20a87'/>
-    <pointer-type-def type-id='02d5f98f' size-in-bits='32' id='d9547e19'/>
-    <pointer-type-def type-id='9454c682' size-in-bits='32' id='4ed5bc7a'/>
-    <pointer-type-def type-id='a84589b1' size-in-bits='32' id='4ab10d53'/>
-    <pointer-type-def type-id='86f41858' size-in-bits='32' id='9f2ec5e8'/>
-    <pointer-type-def type-id='9dcf39b9' size-in-bits='32' id='730c485d'/>
-    <pointer-type-def type-id='060737b9' size-in-bits='32' id='3c0c03e5'/>
-    <pointer-type-def type-id='3ccdd9d3' size-in-bits='32' id='814cad27'/>
-    <pointer-type-def type-id='bf8b79fb' size-in-bits='32' id='629338b7'/>
-    <pointer-type-def type-id='a6863c16' size-in-bits='32' id='21ec59f0'/>
-    <pointer-type-def type-id='e13d7981' size-in-bits='32' id='b3dfc495'/>
     <pointer-type-def type-id='8f92235e' size-in-bits='32' id='90421557'/>
     <reference-type-def kind='lvalue' type-id='002ac4a6' size-in-bits='32' id='c3535580'/>
     <reference-type-def kind='rvalue' type-id='002ac4a6' size-in-bits='32' id='222fd452'/>
     <reference-type-def kind='lvalue' type-id='f0981eed' size-in-bits='32' id='8c787cb7'/>
     <pointer-type-def type-id='f0981eed' size-in-bits='32' id='807869d3'/>
-    <pointer-type-def type-id='ee076206' size-in-bits='32' id='953b12f8'/>
-    <pointer-type-def type-id='03e3ce24' size-in-bits='32' id='8bc971a6'/>
-    <pointer-type-def type-id='a1159711' size-in-bits='32' id='2deb20e5'/>
-    <pointer-type-def type-id='d91da88b' size-in-bits='32' id='4382c817'/>
-    <pointer-type-def type-id='44c9c9bf' size-in-bits='32' id='69aab5c3'/>
-    <pointer-type-def type-id='bf5f1f6d' size-in-bits='32' id='08a2f0e1'/>
-    <pointer-type-def type-id='df741104' size-in-bits='32' id='fbe0c9de'/>
-    <pointer-type-def type-id='a390bd39' size-in-bits='32' id='6d8c64bd'/>
-    <pointer-type-def type-id='1529f4a1' size-in-bits='32' id='3b7e394d'/>
-    <pointer-type-def type-id='33597c16' size-in-bits='32' id='5bf36468'/>
-    <pointer-type-def type-id='be7282a9' size-in-bits='32' id='0f8e37bd'/>
-    <pointer-type-def type-id='089c907d' size-in-bits='32' id='dc329231'/>
-    <pointer-type-def type-id='831ffd4a' size-in-bits='32' id='730be8b4'/>
-    <pointer-type-def type-id='3733befa' size-in-bits='32' id='a1ed8fac'/>
-    <pointer-type-def type-id='0306f1a9' size-in-bits='32' id='d5efc015'/>
-    <pointer-type-def type-id='e65944cb' size-in-bits='32' id='400806b7'/>
-    <pointer-type-def type-id='bdd36586' size-in-bits='32' id='6c7c35c0'/>
-    <pointer-type-def type-id='83901d9f' size-in-bits='32' id='192b003b'/>
-    <pointer-type-def type-id='a8c3878a' size-in-bits='32' id='48f9101d'/>
-    <pointer-type-def type-id='a8c3878b' size-in-bits='32' id='48f9101e'/>
-    <pointer-type-def type-id='c06e176d' size-in-bits='32' id='01a865d1'/>
-    <pointer-type-def type-id='a8c3878c' size-in-bits='32' id='48f9101c'/>
-    <pointer-type-def type-id='deb04b74' size-in-bits='32' id='7399468e'/>
-    <pointer-type-def type-id='cb36c1eb' size-in-bits='32' id='063cc4af'/>
-    <pointer-type-def type-id='a39024d2' size-in-bits='32' id='35958544'/>
-    <pointer-type-def type-id='980f5b1b' size-in-bits='32' id='db388837'/>
-    <pointer-type-def type-id='a4bca08f' size-in-bits='32' id='977cec7b'/>
-    <pointer-type-def type-id='c918d3fc' size-in-bits='32' id='fd9a9816'/>
-    <pointer-type-def type-id='741ec8cb' size-in-bits='32' id='298dc3b7'/>
-    <pointer-type-def type-id='6b259141' size-in-bits='32' id='9990734d'/>
-    <pointer-type-def type-id='394d7db8' size-in-bits='32' id='eb01d38a'/>
-    <pointer-type-def type-id='86dac493' size-in-bits='32' id='66b73f2f'/>
-    <pointer-type-def type-id='e3c17b35' size-in-bits='32' id='fa46db69'/>
-    <pointer-type-def type-id='5e9ac5ac' size-in-bits='32' id='6bc23226'/>
-    <pointer-type-def type-id='8d96fcb9' size-in-bits='32' id='4ae3250d'/>
-    <pointer-type-def type-id='71bbb5b1' size-in-bits='32' id='ebf40e2d'/>
-    <pointer-type-def type-id='65f72aae' size-in-bits='32' id='ad1ea7c0'/>
-    <pointer-type-def type-id='f82c684a' size-in-bits='32' id='43af461c'/>
-    <pointer-type-def type-id='252732ae' size-in-bits='32' id='59a4a320'/>
-    <pointer-type-def type-id='03deda19' size-in-bits='32' id='e25f48c5'/>
-    <pointer-type-def type-id='44d47584' size-in-bits='32' id='f1b14db6'/>
-    <pointer-type-def type-id='c5a9c037' size-in-bits='32' id='9af031fb'/>
-    <pointer-type-def type-id='f52cf650' size-in-bits='32' id='ffc17d12'/>
-    <pointer-type-def type-id='8f97eff0' size-in-bits='32' id='e9d4d69a'/>
-    <pointer-type-def type-id='3c76d9f1' size-in-bits='32' id='fcbe15c5'/>
-    <pointer-type-def type-id='138fbb56' size-in-bits='32' id='d69f3378'/>
-    <pointer-type-def type-id='0c71af8b' size-in-bits='32' id='aa5e90a8'/>
-    <pointer-type-def type-id='0c71af8c' size-in-bits='32' id='aa5e90a9'/>
-    <pointer-type-def type-id='a23173c4' size-in-bits='32' id='bc60df5e'/>
-    <pointer-type-def type-id='0c71af8d' size-in-bits='32' id='aa5e90a7'/>
-    <pointer-type-def type-id='69b156fb' size-in-bits='32' id='7359e10f'/>
-    <pointer-type-def type-id='0e213a62' size-in-bits='32' id='72df644c'/>
-    <pointer-type-def type-id='21e4693d' size-in-bits='32' id='d4f446a9'/>
-    <pointer-type-def type-id='e123a5d8' size-in-bits='32' id='177b60ba'/>
-    <pointer-type-def type-id='9edfc7bf' size-in-bits='32' id='89ccc593'/>
-    <pointer-type-def type-id='ba51789d' size-in-bits='32' id='5fc46b11'/>
-    <pointer-type-def type-id='b9e9f180' size-in-bits='32' id='b95eace2'/>
-    <pointer-type-def type-id='d80b7155' size-in-bits='32' id='f48e25c1'/>
-    <pointer-type-def type-id='3b2e054f' size-in-bits='32' id='6fd868db'/>
-    <pointer-type-def type-id='71686cf2' size-in-bits='32' id='0a719884'/>
-    <pointer-type-def type-id='ada13aa2' size-in-bits='32' id='7a8e54fc'/>
-    <pointer-type-def type-id='8deca216' size-in-bits='32' id='101b8c80'/>
-    <pointer-type-def type-id='b472b352' size-in-bits='32' id='4db2cf0c'/>
+    <pointer-type-def type-id='03e3ce24' size-in-bits='32' id='e45dd401'/>
+    <pointer-type-def type-id='a1159711' size-in-bits='32' id='7a98879a'/>
+    <pointer-type-def type-id='d91da88b' size-in-bits='32' id='bf254042'/>
+    <pointer-type-def type-id='44c9c9bf' size-in-bits='32' id='191aba0c'/>
+    <pointer-type-def type-id='bf5f1f6d' size-in-bits='32' id='f51198ec'/>
+    <pointer-type-def type-id='df741104' size-in-bits='32' id='a46b0935'/>
+    <pointer-type-def type-id='a390bd39' size-in-bits='32' id='34f80e06'/>
+    <pointer-type-def type-id='1529f4a1' size-in-bits='32' id='81c03d6c'/>
+    <pointer-type-def type-id='33597c16' size-in-bits='32' id='f7a0379f'/>
+    <pointer-type-def type-id='be7282a9' size-in-bits='32' id='2b0e4ff2'/>
+    <pointer-type-def type-id='089c907d' size-in-bits='32' id='e08d371c'/>
+    <pointer-type-def type-id='831ffd4a' size-in-bits='32' id='545a856f'/>
+    <pointer-type-def type-id='3733befa' size-in-bits='32' id='70ef270d'/>
+    <pointer-type-def type-id='0306f1a9' size-in-bits='32' id='9bda8fea'/>
+    <pointer-type-def type-id='e65944cb' size-in-bits='32' id='05b410f6'/>
+    <pointer-type-def type-id='bdd36586' size-in-bits='32' id='7c24b203'/>
+    <pointer-type-def type-id='83901d9f' size-in-bits='32' id='1171d1b4'/>
+    <pointer-type-def type-id='a8c3878a' size-in-bits='32' id='625ca386'/>
+    <pointer-type-def type-id='a8c3878b' size-in-bits='32' id='625ca387'/>
+    <pointer-type-def type-id='c06e176d' size-in-bits='32' id='a479abce'/>
+    <pointer-type-def type-id='a8c3878c' size-in-bits='32' id='625ca385'/>
+    <pointer-type-def type-id='f587884e' size-in-bits='32' id='3d342907'/>
+    <pointer-type-def type-id='deb04b74' size-in-bits='32' id='372c8441'/>
+    <pointer-type-def type-id='3d4aa27f' size-in-bits='32' id='806c2c50'/>
+    <pointer-type-def type-id='980f5b1b' size-in-bits='32' id='f1850b08'/>
+    <pointer-type-def type-id='a4bca08f' size-in-bits='32' id='a733b71a'/>
+    <pointer-type-def type-id='c918d3fc' size-in-bits='32' id='b251d72d'/>
+    <pointer-type-def type-id='741ec8cb' size-in-bits='32' id='a522e978'/>
+    <pointer-type-def type-id='6b259141' size-in-bits='32' id='950241b0'/>
+    <pointer-type-def type-id='394d7db8' size-in-bits='32' id='21f41051'/>
+    <pointer-type-def type-id='86dac493' size-in-bits='32' id='44f25f18'/>
+    <pointer-type-def type-id='e3c17b35' size-in-bits='32' id='2ccb7754'/>
+    <pointer-type-def type-id='5e9ac5ac' size-in-bits='32' id='792859dd'/>
+    <pointer-type-def type-id='8d96fcb9' size-in-bits='32' id='b76b1db6'/>
+    <pointer-type-def type-id='71bbb5b1' size-in-bits='32' id='c1bcf4ec'/>
+    <pointer-type-def type-id='65f72aae' size-in-bits='32' id='1e124adf'/>
+    <pointer-type-def type-id='f82c684a' size-in-bits='32' id='f34f71b5'/>
+    <pointer-type-def type-id='1b85d290' size-in-bits='32' id='c003e813'/>
+    <pointer-type-def type-id='252732ae' size-in-bits='32' id='49f4e2fd'/>
+    <pointer-type-def type-id='1408a281' size-in-bits='32' id='3d23490c'/>
+    <pointer-type-def type-id='c5a9c037' size-in-bits='32' id='368860b2'/>
+    <pointer-type-def type-id='f52cf650' size-in-bits='32' id='931a74f1'/>
+    <pointer-type-def type-id='8f97eff0' size-in-bits='32' id='fc76ab83'/>
+    <pointer-type-def type-id='3c76d9f1' size-in-bits='32' id='0408c00e'/>
+    <pointer-type-def type-id='138fbb56' size-in-bits='32' id='211caeb7'/>
+    <pointer-type-def type-id='0c71af8b' size-in-bits='32' id='1135eb83'/>
+    <pointer-type-def type-id='0c71af8c' size-in-bits='32' id='1135eb84'/>
+    <pointer-type-def type-id='a23173c4' size-in-bits='32' id='68835375'/>
+    <pointer-type-def type-id='0c71af8d' size-in-bits='32' id='1135eb82'/>
+    <pointer-type-def type-id='8791c9f1' size-in-bits='32' id='4d8d0cb6'/>
+    <pointer-type-def type-id='69b156fb' size-in-bits='32' id='a1f794fc'/>
+    <pointer-type-def type-id='570a4472' size-in-bits='32' id='c0e9d857'/>
+    <pointer-type-def type-id='e123a5d8' size-in-bits='32' id='9b7fadc5'/>
+    <pointer-type-def type-id='9edfc7bf' size-in-bits='32' id='33caa8c4'/>
+    <pointer-type-def type-id='ba51789d' size-in-bits='32' id='82203b3c'/>
+    <pointer-type-def type-id='b9e9f180' size-in-bits='32' id='e1be4c89'/>
+    <pointer-type-def type-id='d80b7155' size-in-bits='32' id='7c2a9d98'/>
+    <pointer-type-def type-id='3b2e054f' size-in-bits='32' id='c05a64c8'/>
+    <pointer-type-def type-id='71686cf2' size-in-bits='32' id='0c1914a7'/>
+    <pointer-type-def type-id='ada13aa2' size-in-bits='32' id='bd3e8fb9'/>
+    <pointer-type-def type-id='30a82da4' size-in-bits='32' id='c640490b'/>
+    <pointer-type-def type-id='8deca216' size-in-bits='32' id='32c7d509'/>
+    <pointer-type-def type-id='b472b352' size-in-bits='32' id='23103ee5'/>
     <pointer-type-def type-id='c523b9f1' size-in-bits='32' id='323d93c1'/>
     <pointer-type-def type-id='323d93c1' size-in-bits='32' id='01efdaf1'/>
     <pointer-type-def type-id='aa12d1bd' size-in-bits='32' id='822cd80e'/>
@@ -17626,11 +17626,11 @@
       <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='582752bf'>
+    <function-type size-in-bits='32' id='54e064ca'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='4aacf270'>
@@ -17640,18 +17640,18 @@
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='357daae3'>
+    <function-type size-in-bits='32' id='ba3ff62b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='cc6e09ca'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='08ced926'>
+    <function-type size-in-bits='32' id='357daae3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='cc6e09ca'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='39763bbe'>
@@ -17659,12 +17659,12 @@
       <parameter type-id='96f3d089'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='8a107f0d'>
+    <function-type size-in-bits='32' id='655c526c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='392f372a'>
@@ -17675,12 +17675,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='08cb7a78'>
+    <function-type size-in-bits='32' id='2afd2d4d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='93d80062'>
@@ -17689,11 +17689,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='1a60c48e'>
+    <function-type size-in-bits='32' id='d24762a5'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='92fdb75f'>
@@ -17703,11 +17703,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='96f3d089'/>
     </function-type>
-    <function-type size-in-bits='32' id='7c644d19'>
+    <function-type size-in-bits='32' id='cc93eb66'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='96f3d089'/>
     </function-type>
     <function-type size-in-bits='32' id='cf650c06'>
@@ -17767,11 +17767,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='9665bdb6'>
+    <function-type size-in-bits='32' id='1ce8356d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='0257c247'>
@@ -17781,19 +17781,19 @@
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='66488491'>
+    <function-type size-in-bits='32' id='9f8e2b3e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='a3c89a22'>
+    <function-type size-in-bits='32' id='5c9d1bb1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='7cc5073b'>
@@ -17804,12 +17804,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='028fa27d'>
+    <function-type size-in-bits='32' id='f6f688b2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='9ee61f63'>
@@ -17818,11 +17818,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='50f8d93d'>
+    <function-type size-in-bits='32' id='47aa8c3c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='6b33627a'>
@@ -17832,11 +17832,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='973e3c3f'/>
     </function-type>
-    <function-type size-in-bits='32' id='76a432e8'>
+    <function-type size-in-bits='32' id='039aab3d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='973e3c3f'/>
     </function-type>
     <function-type size-in-bits='32' id='4861351d'>
@@ -17850,11 +17850,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='14ac55ad'>
+    <function-type size-in-bits='32' id='c3f30acc'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='2baaba0a'>
@@ -17864,19 +17864,19 @@
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='5ebac3d8'>
+    <function-type size-in-bits='32' id='2e36b4ed'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='eb1675b3'>
+    <function-type size-in-bits='32' id='14209476'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='06dcb13c'>
@@ -17887,12 +17887,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='129c82ea'>
+    <function-type size-in-bits='32' id='672db497'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='7f8c4cf0'>
@@ -17901,11 +17901,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='263f3dcc'>
+    <function-type size-in-bits='32' id='28a5f5af'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='89a65589'>
@@ -17915,11 +17915,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
-    <function-type size-in-bits='32' id='047ae073'>
+    <function-type size-in-bits='32' id='94426c08'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='1a7fe6b0'/>
     </function-type>
     <function-type size-in-bits='32' id='f68d4a05'>
@@ -17959,25 +17959,25 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a58'>
+    <function-type size-in-bits='32' id='69749343'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a59'>
+    <function-type size-in-bits='32' id='69749344'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='2f3e7a5a'>
+    <function-type size-in-bits='32' id='69749345'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='846957ad'>
@@ -18001,25 +18001,25 @@
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab40f'>
+    <function-type size-in-bits='32' id='ae98ce5c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab410'>
+    <function-type size-in-bits='32' id='ae98ce5d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='e8eab411'>
+    <function-type size-in-bits='32' id='ae98ce5e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='eb909c09'>
@@ -18045,28 +18045,28 @@
       <parameter type-id='96f3d089'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ec'>
+    <function-type size-in-bits='32' id='8ae4e70f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ed'>
+    <function-type size-in-bits='32' id='8ae4e710'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='d5e4d4ee'>
+    <function-type size-in-bits='32' id='8ae4e711'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='09e3e169'>
@@ -18093,28 +18093,28 @@
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c53'>
+    <function-type size-in-bits='32' id='f44a3fa8'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c54'>
+    <function-type size-in-bits='32' id='f44a3fa9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='1bb86c55'>
+    <function-type size-in-bits='32' id='f44a3faa'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='02d5f98d'>
@@ -18135,25 +18135,25 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589af'>
+    <function-type size-in-bits='32' id='8f0b7f5a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589b0'>
+    <function-type size-in-bits='32' id='8f0b7f5b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='a84589b1'>
+    <function-type size-in-bits='32' id='8f0b7f5c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='9454c680'>
@@ -18177,25 +18177,25 @@
       <parameter type-id='786cbe73'/>
       <return type-id='9a10f134'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41856'>
+    <function-type size-in-bits='32' id='292a411b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='0b9c02cb'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41857'>
+    <function-type size-in-bits='32' id='292a411c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='c8745fdc'/>
     </function-type>
-    <function-type size-in-bits='32' id='86f41858'>
+    <function-type size-in-bits='32' id='292a411d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='9a10f134'/>
     </function-type>
     <function-type size-in-bits='32' id='3ccdd9d3'>
@@ -18272,11 +18272,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='ffadf963'>
+    <function-type size-in-bits='32' id='47ca8d46'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='36acdbcc'>
@@ -18286,19 +18286,19 @@
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='1e23d39a'>
+    <function-type size-in-bits='32' id='c1b550c7'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='7c58e9c1'>
+    <function-type size-in-bits='32' id='3c662e98'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='8ae90496'>
@@ -18309,12 +18309,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='9f92723c'>
+    <function-type size-in-bits='32' id='d35f73d9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='d6f3cc1e'>
@@ -18323,11 +18323,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='aa966e7a'>
+    <function-type size-in-bits='32' id='521af3a9'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='4aa4e453'>
@@ -18337,11 +18337,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='adf18958'/>
     </function-type>
-    <function-type size-in-bits='32' id='60d09265'>
+    <function-type size-in-bits='32' id='b062a33a'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='adf18958'/>
     </function-type>
     <function-type size-in-bits='32' id='c2ab665d'>
@@ -18360,11 +18360,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='84f1ec00'>
+    <function-type size-in-bits='32' id='9d54666b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='eda358d5'>
@@ -18374,11 +18374,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='357a5107'>
+    <function-type size-in-bits='32' id='fe376334'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='2207a1d4'>
@@ -18387,12 +18387,12 @@
       <parameter type-id='70de5c43'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='dbddeaa4'>
+    <function-type size-in-bits='32' id='ec86bf87'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='b3920ec1'>
@@ -18403,12 +18403,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='dce8633b'>
+    <function-type size-in-bits='32' id='d44533d0'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='635e0a25'>
@@ -18417,11 +18417,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='ffceb0d7'>
+    <function-type size-in-bits='32' id='161aeec2'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='40138048'>
@@ -18431,11 +18431,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='cc6e09ca'/>
     </function-type>
-    <function-type size-in-bits='32' id='118a7d6e'>
+    <function-type size-in-bits='32' id='f1f2c7f3'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='cc6e09ca'/>
     </function-type>
     <function-type size-in-bits='32' id='6a7bb135'>
@@ -18450,11 +18450,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='234ebc1f'>
+    <function-type size-in-bits='32' id='c60ec5ea'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='63e40290'>
@@ -18464,19 +18464,19 @@
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='a3568ec6'>
+    <function-type size-in-bits='32' id='b58a040b'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='b6337d2d'>
+    <function-type size-in-bits='32' id='c71e554c'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='48a0988a'>
@@ -18487,12 +18487,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='aef1d658'>
+    <function-type size-in-bits='32' id='4543f86d'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='024b2e02'>
@@ -18501,11 +18501,11 @@
       <parameter type-id='1f3810cb'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='82e9406e'>
+    <function-type size-in-bits='32' id='72b5ef45'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='4d6cc7ff'>
@@ -18515,11 +18515,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='8dfe2e06'/>
     </function-type>
-    <function-type size-in-bits='32' id='32dce039'>
+    <function-type size-in-bits='32' id='171c33c6'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='8dfe2e06'/>
     </function-type>
     <function-type size-in-bits='32' id='03e3ce24'>
@@ -18665,11 +18665,11 @@
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='cb36c1eb'>
+    <function-type size-in-bits='32' id='f587884e'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='deb04b74'>
@@ -18679,11 +18679,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='a39024d2'>
+    <function-type size-in-bits='32' id='3d4aa27f'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='a4bca08f'>
@@ -18783,12 +18783,12 @@
       <parameter type-id='96f3d089'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='03deda19'>
+    <function-type size-in-bits='32' id='1b85d290'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='252732ae'>
@@ -18799,12 +18799,12 @@
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='44d47584'>
+    <function-type size-in-bits='32' id='1408a281'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='70de5c43'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='a23173c4'>
@@ -18870,11 +18870,11 @@
       <parameter type-id='8dfe2e06'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='0e213a62'>
+    <function-type size-in-bits='32' id='8791c9f1'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter type-id='2aee9912'/>
+      <parameter is-variadic='yes'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='69b156fb'>
@@ -18884,11 +18884,11 @@
       <parameter type-id='786cbe73'/>
       <return type-id='48b5725f'/>
     </function-type>
-    <function-type size-in-bits='32' id='21e4693d'>
+    <function-type size-in-bits='32' id='570a4472'>
       <parameter type-id='fae49a1f'/>
       <parameter type-id='96f3d089'/>
       <parameter type-id='38565183'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='2aee9912'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='e123a5d8'>
@@ -18972,8 +18972,8 @@
         <var-decl name='__private' type-id='e4652d73' visibility='default' filepath='bionic/libc/include/bits/pthread_types.h' line='76' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='AChoreographer_frameCallback' type-id='f1eb0faf' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' id='f687fd19'/>
-    <typedef-decl name='AChoreographer_frameCallback64' type-id='f1eb0fb0' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' id='acccec6b'/>
+    <typedef-decl name='AChoreographer_frameCallback' type-id='4382769c' filepath='frameworks/native/include/android/choreographer.h' line='45' column='1' id='f687fd19'/>
+    <typedef-decl name='AChoreographer_frameCallback64' type-id='4382769d' filepath='frameworks/native/include/android/choreographer.h' line='55' column='1' id='acccec6b'/>
     <typedef-decl name='__uint64_t' type-id='f0981eec' filepath='bionic/libc/include/stdint.h' line='47' column='1' id='8910171f'/>
     <typedef-decl name='imaxdiv_t' type-id='e7f43f7b' filepath='bionic/libc/include/inttypes.h' line='255' column='1' id='5c0b4dc9'/>
     <typedef-decl name='intmax_t' type-id='9da381c4' filepath='bionic/libc/include/stdint.h' line='104' column='1' id='e104d842'/>
@@ -19098,8 +19098,8 @@
     <reference-type-def kind='rvalue' type-id='62e477cd' size-in-bits='32' id='82aceccd'/>
     <pointer-type-def type-id='62e477cd' size-in-bits='32' id='e8fa2672'/>
     <pointer-type-def type-id='e7f43f7b' size-in-bits='32' id='8567d8b0'/>
-    <pointer-type-def type-id='7b5ced03' size-in-bits='32' id='f1eb0faf'/>
-    <pointer-type-def type-id='7b5ced04' size-in-bits='32' id='f1eb0fb0'/>
+    <pointer-type-def type-id='7b5ced03' size-in-bits='32' id='4382769d'/>
+    <pointer-type-def type-id='7b5ced04' size-in-bits='32' id='4382769c'/>
     <pointer-type-def type-id='7b0c0278' size-in-bits='32' id='136b85b5'/>
     <pointer-type-def type-id='aa12d1be' size-in-bits='32' id='822cd80f'/>
     <pointer-type-def type-id='5671eca3' size-in-bits='32' id='ddc6bda3'/>
@@ -20277,12 +20277,12 @@
     </function-decl>
     <typedef-decl name='AChoreographer' type-id='d1af9805' filepath='frameworks/native/include/android/choreographer.h' line='35' column='1' id='7b0c0278'/>
     <function-type size-in-bits='32' id='7b5ced03'>
-      <parameter type-id='95e97e5f'/>
+      <parameter type-id='9da381c4'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
     </function-type>
     <function-type size-in-bits='32' id='7b5ced04'>
-      <parameter type-id='9da381c4'/>
+      <parameter type-id='95e97e5f'/>
       <parameter type-id='eaa32e2f'/>
       <return type-id='48b5725f'/>
     </function-type>
@@ -20648,7 +20648,7 @@
   <abi-instr address-size='32' path='frameworks/base/native/android/input.cpp' language='LANG_C_plus_plus_14'>
     <class-decl name='AInputQueue' size-in-bits='8' is-struct='yes' visibility='default' filepath='frameworks/base/core/jni/include/android_runtime/android_view_InputQueue.h' line='30' column='1' id='81665327'/>
     <typedef-decl name='AInputQueue' type-id='81665327' filepath='frameworks/native/include/android/input.h' line='1298' column='1' id='18581c08'/>
-    <typedef-decl name='ALooper_callbackFunc' type-id='d08b57b3' filepath='frameworks/native/include/android/looper.h' line='168' column='1' id='0f66625a'/>
+    <typedef-decl name='ALooper_callbackFunc' type-id='29a02c10' filepath='frameworks/native/include/android/looper.h' line='168' column='1' id='0f66625a'/>
     <pointer-type-def type-id='18581c08' size-in-bits='32' id='dcca009f'/>
     <pointer-type-def type-id='2a632eb8' size-in-bits='32' id='3fc367ce'/>
     <qualified-type-def type-id='2a632eb8' const='yes' id='2adf3de5'/>
@@ -20657,7 +20657,7 @@
     <qualified-type-def type-id='95e97e60' const='yes' id='2448a866'/>
     <reference-type-def kind='lvalue' type-id='2448a866' size-in-bits='32' id='6160e17a'/>
     <pointer-type-def type-id='2448a866' size-in-bits='32' id='6d60f45e'/>
-    <pointer-type-def type-id='073bc15f' size-in-bits='32' id='d08b57b3'/>
+    <pointer-type-def type-id='073bc15f' size-in-bits='32' id='29a02c10'/>
     <pointer-type-def type-id='5c3d41cf' size-in-bits='32' id='b7c0a646'/>
     <pointer-type-def type-id='b7c0a646' size-in-bits='32' id='b045fc04'/>
     <pointer-type-def type-id='b02ad8ee' size-in-bits='32' id='863667dd'/>
@@ -21469,34 +21469,34 @@
         <var-decl name='oem' type-id='1595aa6b' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='361' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='544'>
-        <var-decl name='setSwapInterval' type-id='4895e6ee' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='368' column='1'/>
+        <var-decl name='setSwapInterval' type-id='17c3f917' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='368' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='dequeueBuffer_DEPRECATED' type-id='e1460e41' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='388' column='1'/>
+        <var-decl name='dequeueBuffer_DEPRECATED' type-id='aa16aae2' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='388' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='608'>
-        <var-decl name='lockBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='402' column='1'/>
+        <var-decl name='lockBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='402' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='queueBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='424' column='1'/>
+        <var-decl name='queueBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='424' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='672'>
-        <var-decl name='query' type-id='e0289d60' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='432' column='1'/>
+        <var-decl name='query' type-id='87c7c9f5' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='perform' type-id='6e6b4552' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='449' column='1'/>
+        <var-decl name='perform' type-id='2d8e6f85' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='736'>
-        <var-decl name='cancelBuffer_DEPRECATED' type-id='accce85f' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='469' column='1'/>
+        <var-decl name='cancelBuffer_DEPRECATED' type-id='edd58092' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='469' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='dequeueBuffer' type-id='d94a7138' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='491' column='1'/>
+        <var-decl name='dequeueBuffer' type-id='fe1a2479' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='491' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='800'>
-        <var-decl name='queueBuffer' type-id='34e25e76' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='513' column='1'/>
+        <var-decl name='queueBuffer' type-id='abc0bac7' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='513' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='cancelBuffer' type-id='34e25e76' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='541' column='1'/>
+        <var-decl name='cancelBuffer' type-id='abc0bac7' visibility='default' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='541' column='1'/>
       </data-member>
       <member-function access='public' constructor='yes'>
         <function-decl name='ANativeWindow' filepath='frameworks/native/libs/nativewindow/include/system/window.h' line='327' column='1' visibility='default' binding='global' size-in-bits='32'>
@@ -21589,10 +21589,10 @@
         <var-decl name='reserved' type-id='209ef23f' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='incRef' type-id='9ef5cd4c' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='54' column='1'/>
+        <var-decl name='incRef' type-id='f0a775a9' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='decRef' type-id='9ef5cd4c' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='55' column='1'/>
+        <var-decl name='decRef' type-id='f0a775a9' visibility='default' filepath='frameworks/native/libs/nativebase/include/nativebase/nativebase.h' line='55' column='1'/>
       </data-member>
     </class-decl>
     <class-decl name='native_handle' size-in-bits='96' is-struct='yes' visibility='default' filepath='system/core/libcutils/include/cutils/native_handle.h' line='34' column='1' id='3181ea79'>
@@ -21649,14 +21649,14 @@
     <pointer-type-def type-id='5faa5468' size-in-bits='32' id='db22a3e6'/>
     <qualified-type-def type-id='40cec2e5' const='yes' id='777a3c35'/>
     <pointer-type-def type-id='777a3c35' size-in-bits='32' id='346ca4cd'/>
-    <pointer-type-def type-id='18a8f8ab' size-in-bits='32' id='accce85f'/>
-    <pointer-type-def type-id='7c01b235' size-in-bits='32' id='e1460e41'/>
-    <pointer-type-def type-id='a01c551e' size-in-bits='32' id='d94a7138'/>
-    <pointer-type-def type-id='f67629f4' size-in-bits='32' id='34e25e76'/>
-    <pointer-type-def type-id='81905a9c' size-in-bits='32' id='4895e6ee'/>
-    <pointer-type-def type-id='e1037128' size-in-bits='32' id='6e6b4552'/>
-    <pointer-type-def type-id='9e53d056' size-in-bits='32' id='e0289d60'/>
-    <pointer-type-def type-id='d64c5e3a' size-in-bits='32' id='9ef5cd4c'/>
+    <pointer-type-def type-id='18a8f8ab' size-in-bits='32' id='edd58092'/>
+    <pointer-type-def type-id='7c01b235' size-in-bits='32' id='aa16aae2'/>
+    <pointer-type-def type-id='a01c551e' size-in-bits='32' id='fe1a2479'/>
+    <pointer-type-def type-id='f67629f4' size-in-bits='32' id='abc0bac7'/>
+    <pointer-type-def type-id='81905a9c' size-in-bits='32' id='17c3f917'/>
+    <pointer-type-def type-id='561290fc' size-in-bits='32' id='2d8e6f85'/>
+    <pointer-type-def type-id='9e53d056' size-in-bits='32' id='87c7c9f5'/>
+    <pointer-type-def type-id='d64c5e3a' size-in-bits='32' id='f0a775a9'/>
     <pointer-type-def type-id='aa12d1c3' size-in-bits='32' id='822cd814'/>
     <reference-type-def kind='lvalue' type-id='7dd446db' size-in-bits='32' id='f43d11bf'/>
     <pointer-type-def type-id='7dd446db' size-in-bits='32' id='f83d180b'/>
@@ -21881,7 +21881,7 @@
       <parameter type-id='95e97e5e'/>
       <return type-id='95e97e5e'/>
     </function-type>
-    <function-type size-in-bits='32' id='e1037128'>
+    <function-type size-in-bits='32' id='561290fc'>
       <parameter type-id='96ae8d47'/>
       <parameter type-id='95e97e5e'/>
       <parameter is-variadic='yes'/>
@@ -23062,7 +23062,7 @@
       </member-function>
     </class-decl>
     <typedef-decl name='AStorageManager' type-id='56516754' filepath='frameworks/native/include/android/storage_manager.h' line='40' column='1' id='6fc023b3'/>
-    <typedef-decl name='AStorageManager_obbCallbackFunc' type-id='238ccd13' filepath='frameworks/native/include/android/storage_manager.h' line='123' column='1' id='9299e4b4'/>
+    <typedef-decl name='AStorageManager_obbCallbackFunc' type-id='7cd01d6e' filepath='frameworks/native/include/android/storage_manager.h' line='123' column='1' id='9299e4b4'/>
     <reference-type-def kind='lvalue' type-id='56516754' size-in-bits='32' id='e37f89be'/>
     <pointer-type-def type-id='56516754' size-in-bits='32' id='df7f8372'/>
     <pointer-type-def type-id='6fc023b3' size-in-bits='32' id='df7f8373'/>
@@ -23148,12 +23148,12 @@
     <pointer-type-def type-id='96cd7851' size-in-bits='32' id='e074a9a1'/>
     <qualified-type-def type-id='3707128c' const='yes' id='31c8e515'/>
     <pointer-type-def type-id='31c8e515' size-in-bits='32' id='9e40e22d'/>
-    <pointer-type-def type-id='735b63b3' size-in-bits='32' id='cb44d457'/>
-    <pointer-type-def type-id='32a29f07' size-in-bits='32' id='2841c17b'/>
+    <pointer-type-def type-id='735b63b3' size-in-bits='32' id='a38b5496'/>
+    <pointer-type-def type-id='32a29f07' size-in-bits='32' id='57a87078'/>
     <reference-type-def kind='lvalue' type-id='0efd2e9e' size-in-bits='32' id='7cfadc20'/>
     <pointer-type-def type-id='0efd2e9e' size-in-bits='32' id='88faef04'/>
     <pointer-type-def type-id='a5d64365' size-in-bits='32' id='dcdcfc25'/>
-    <pointer-type-def type-id='f521429f' size-in-bits='32' id='238ccd13'/>
+    <pointer-type-def type-id='f521429f' size-in-bits='32' id='7cd01d6e'/>
     <qualified-type-def type-id='3ff5601b' volatile='yes' id='fda05812'/>
     <qualified-type-def type-id='0efd2e9e' volatile='yes' id='3707128c'/>
     <pointer-type-def type-id='3707128c' size-in-bits='32' id='46225b52'/>
@@ -23201,10 +23201,10 @@
       <class-decl name='Vector&lt;ObbCallback *&gt;' size-in-bits='160' visibility='default' filepath='system/core/libutils/include/utils/Vector.h' line='57' column='1' id='3847ab67'>
         <base-class access='private' layout-offset-in-bits='0' type-id='86634f02'/>
         <member-type access='private'>
-          <typedef-decl name='compar_r_t' type-id='2841c17b' filepath='system/core/libutils/include/utils/Vector.h' line='186' column='1' id='7567dbda'/>
+          <typedef-decl name='compar_r_t' type-id='57a87078' filepath='system/core/libutils/include/utils/Vector.h' line='186' column='1' id='7567dbda'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='compar_t' type-id='cb44d457' filepath='system/core/libutils/include/utils/Vector.h' line='185' column='1' id='69af6af7'/>
+          <typedef-decl name='compar_t' type-id='a38b5496' filepath='system/core/libutils/include/utils/Vector.h' line='185' column='1' id='69af6af7'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='const_iterator' type-id='b5e7b678' filepath='system/core/libutils/include/utils/Vector.h' line='200' column='1' id='9d183c99'/>
@@ -24518,7 +24518,7 @@
     </class-decl>
     <typedef-decl name='ARect' type-id='c9ee9172' filepath='frameworks/native/libs/arect/include/android/rect.h' line='57' column='1' id='d6dabff9'/>
     <typedef-decl name='ASurfaceTransactionStats' type-id='57f0cd10' filepath='frameworks/native/include/android/surface_control.h' line='119' column='1' id='d8cb99c5'/>
-    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='c4e02a75' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
+    <typedef-decl name='ASurfaceTransaction_OnComplete' type-id='336b85fe' filepath='frameworks/native/include/android/surface_control.h' line='137' column='1' id='f2816675'/>
     <typedef-decl name='__kernel_uid32_t' type-id='f0981eed' filepath='bionic/libc/kernel/uapi/asm-generic/posix_types.h' line='49' column='1' id='70734f24'/>
     <typedef-decl name='__uid_t' type-id='70734f24' filepath='bionic/libc/include/sys/types.h' line='44' column='1' id='cc5fcceb'/>
     <typedef-decl name='binder_size_t' type-id='f0981eec' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='39' column='1' id='9af0438f'/>
@@ -26260,8 +26260,8 @@
     <qualified-type-def type-id='807869d4' const='yes' id='de9ce8e8'/>
     <reference-type-def kind='lvalue' type-id='de9ce8e8' size-in-bits='32' id='3f027c4a'/>
     <reference-type-def kind='lvalue' type-id='807869d4' size-in-bits='32' id='328eccaf'/>
-    <pointer-type-def type-id='8cf25b48' size-in-bits='32' id='eb6f9422'/>
-    <pointer-type-def type-id='ba286cd1' size-in-bits='32' id='c4e02a75'/>
+    <pointer-type-def type-id='8cf25b48' size-in-bits='32' id='f11d61bd'/>
+    <pointer-type-def type-id='ba286cd1' size-in-bits='32' id='336b85fe'/>
     <reference-type-def kind='lvalue' type-id='eaa32e2f' size-in-bits='32' id='67e1782b'/>
     <reference-type-def kind='rvalue' type-id='eaa32e2f' size-in-bits='32' id='94effc77'/>
     <qualified-type-def type-id='673b29cf' volatile='yes' id='84653d39'/>
@@ -26671,7 +26671,7 @@
       </class-decl>
       <class-decl name='Parcel' size-in-bits='480' visibility='default' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='55' column='1' id='cb49a619'>
         <member-type access='private'>
-          <typedef-decl name='release_func' type-id='eb6f9422' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' id='d7b9bcec'/>
+          <typedef-decl name='release_func' type-id='f11d61bd' filepath='frameworks/native/libs/binder/include/binder/Parcel.h' line='482' column='1' id='d7b9bcec'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='FlattenableHelperInterface' visibility='default' is-declaration-only='yes' id='783cc67a'/>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 3905060e..5702c50d 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -1081,154 +1081,153 @@
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-206'/>
     <reference-type-def kind='lvalue' type-id='type-id-15' size-in-bits='64' id='type-id-207'/>
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-208'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-209'/>
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
+    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-211'/>
     <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-212'/>
-    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-213'/>
-    <reference-type-def kind='lvalue' type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-215'/>
-    <reference-type-def kind='lvalue' type-id='type-id-212' size-in-bits='64' id='type-id-216'/>
-    <reference-type-def kind='rvalue' type-id='type-id-212' size-in-bits='64' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-218'/>
-    <reference-type-def kind='lvalue' type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
-    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-222'/>
-    <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
-    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-226'/>
-    <reference-type-def kind='lvalue' type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
-    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-229'/>
-    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-230'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-217'/>
+    <reference-type-def kind='lvalue' type-id='type-id-217' size-in-bits='64' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-219'/>
+    <reference-type-def kind='lvalue' type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
+    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-221'/>
+    <reference-type-def kind='lvalue' type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
+    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
+    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-229'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-230'/>
     <reference-type-def kind='lvalue' type-id='type-id-230' size-in-bits='64' id='type-id-231'/>
-    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-232'/>
-    <reference-type-def kind='lvalue' type-id='type-id-232' size-in-bits='64' id='type-id-233'/>
-    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-234' size-in-bits='64' id='type-id-235'/>
-    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-237'/>
-    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-238'/>
-    <reference-type-def kind='lvalue' type-id='type-id-238' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-240'/>
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-243'/>
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-244'/>
-    <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-246'/>
-    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-247' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-249'/>
-    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-250'/>
-    <reference-type-def kind='lvalue' type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-252'/>
-    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-253'/>
-    <reference-type-def kind='lvalue' type-id='type-id-253' size-in-bits='64' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-255'/>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-256'/>
-    <reference-type-def kind='lvalue' type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-259'/>
-    <reference-type-def kind='lvalue' type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-261'/>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-262'/>
-    <reference-type-def kind='lvalue' type-id='type-id-262' size-in-bits='64' id='type-id-263'/>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-264'/>
-    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-265'/>
-    <reference-type-def kind='lvalue' type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
-    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-267'/>
-    <qualified-type-def type-id='type-id-148' const='yes' id='type-id-268'/>
-    <reference-type-def kind='lvalue' type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-270'/>
-    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-271' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-273'/>
-    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-276'/>
-    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-279'/>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-280'/>
-    <reference-type-def kind='lvalue' type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-283'/>
-    <reference-type-def kind='lvalue' type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-286'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-288'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-289'/>
-    <reference-type-def kind='lvalue' type-id='type-id-289' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-291'/>
-    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-292'/>
-    <reference-type-def kind='lvalue' type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-294'/>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-295'/>
-    <reference-type-def kind='lvalue' type-id='type-id-295' size-in-bits='64' id='type-id-296'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-298'/>
-    <reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-300'/>
-    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-301'/>
-    <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-304'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-306'/>
-    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-307'/>
-    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-309'/>
-    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-312'/>
-    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-84'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-232'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-235'/>
+    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-236'/>
+    <reference-type-def kind='lvalue' type-id='type-id-236' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-238'/>
+    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-239'/>
+    <reference-type-def kind='lvalue' type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-242'/>
+    <reference-type-def kind='lvalue' type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-244'/>
+    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-248'/>
+    <reference-type-def kind='lvalue' type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-253'/>
+    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-256'/>
+    <qualified-type-def type-id='type-id-148' const='yes' id='type-id-257'/>
+    <reference-type-def kind='lvalue' type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-259'/>
+    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-260'/>
+    <reference-type-def kind='lvalue' type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-262'/>
+    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-263'/>
+    <reference-type-def kind='lvalue' type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-265'/>
+    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-266'/>
+    <reference-type-def kind='lvalue' type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-268'/>
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-269'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-158' const='yes' id='type-id-272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-274'/>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-275' size-in-bits='64' id='type-id-276'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-277'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-278'/>
+    <reference-type-def kind='lvalue' type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-280'/>
+    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-281'/>
+    <reference-type-def kind='lvalue' type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-284'/>
+    <reference-type-def kind='lvalue' type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-286'/>
+    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-287'/>
+    <reference-type-def kind='lvalue' type-id='type-id-287' size-in-bits='64' id='type-id-288'/>
+    <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-289'/>
+    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-290'/>
+    <reference-type-def kind='lvalue' type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-292'/>
+    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-293'/>
+    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-295'/>
+    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-296'/>
+    <reference-type-def kind='lvalue' type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-299'/>
+    <reference-type-def kind='lvalue' type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-301'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-84'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-303'/>
+    <reference-type-def kind='lvalue' type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-306'/>
+    <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-308'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-313'/>
+    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-314'/>
     <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-315'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-316'/>
-    <qualified-type-def type-id='type-id-182' const='yes' id='type-id-317'/>
-    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-319'/>
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-320'/>
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-321'/>
-    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-322'/>
-    <reference-type-def kind='lvalue' type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-324'/>
-    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-325'/>
-    <reference-type-def kind='lvalue' type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-327'/>
-    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
-    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-330'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-331'/>
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-332'/>
-    <reference-type-def kind='lvalue' type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-59'/>
-    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-334'/>
-    <reference-type-def kind='lvalue' type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-59' size-in-bits='64' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-337'/>
-    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-338'/>
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-339'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-340'/>
-    <reference-type-def kind='lvalue' type-id='type-id-340' size-in-bits='64' id='type-id-341'/>
-    <qualified-type-def type-id='type-id-78' const='yes' id='type-id-342'/>
-    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-343'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-344'/>
-    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-348'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
-    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-351'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
-    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-354'/>
-    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
-    <qualified-type-def type-id='type-id-356' const='yes' id='type-id-357'/>
-    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
-    <qualified-type-def type-id='type-id-359' const='yes' id='type-id-360'/>
-    <reference-type-def kind='lvalue' type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <qualified-type-def type-id='type-id-198' const='yes' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <qualified-type-def type-id='type-id-201' const='yes' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-321'/>
+    <reference-type-def kind='lvalue' type-id='type-id-321' size-in-bits='64' id='type-id-322'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-59'/>
+    <qualified-type-def type-id='type-id-59' const='yes' id='type-id-323'/>
+    <reference-type-def kind='lvalue' type-id='type-id-323' size-in-bits='64' id='type-id-324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-59' size-in-bits='64' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-59' size-in-bits='64' id='type-id-326'/>
+    <qualified-type-def type-id='type-id-74' const='yes' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-328'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-329'/>
+    <reference-type-def kind='lvalue' type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-78' const='yes' id='type-id-331'/>
+    <qualified-type-def type-id='type-id-27' const='yes' id='type-id-332'/>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-333'/>
+    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-334'/>
+    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-336' const='yes' id='type-id-337'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
+    <qualified-type-def type-id='type-id-339' const='yes' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-341'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-343'/>
+    <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
+    <qualified-type-def type-id='type-id-345' const='yes' id='type-id-346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-346' size-in-bits='64' id='type-id-347'/>
+    <qualified-type-def type-id='type-id-348' const='yes' id='type-id-349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-349' size-in-bits='64' id='type-id-350'/>
+    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-352' size-in-bits='64' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-354' const='yes' id='type-id-355'/>
+    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-357'/>
+    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-359'/>
+    <reference-type-def kind='lvalue' type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-361'/>
     <qualified-type-def type-id='type-id-362' const='yes' id='type-id-363'/>
     <reference-type-def kind='lvalue' type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <qualified-type-def type-id='type-id-365' const='yes' id='type-id-366'/>
@@ -1241,86 +1240,86 @@
     <reference-type-def kind='lvalue' type-id='type-id-374' size-in-bits='64' id='type-id-375'/>
     <qualified-type-def type-id='type-id-376' const='yes' id='type-id-377'/>
     <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-379'/>
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-381'/>
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-383'/>
-    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
-    <qualified-type-def type-id='type-id-387' const='yes' id='type-id-388'/>
-    <reference-type-def kind='lvalue' type-id='type-id-388' size-in-bits='64' id='type-id-389'/>
+    <qualified-type-def type-id='type-id-379' const='yes' id='type-id-380'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-382'/>
+    <qualified-type-def type-id='type-id-383' const='yes' id='type-id-384'/>
+    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-385'/>
+    <qualified-type-def type-id='type-id-386' const='yes' id='type-id-387'/>
+    <reference-type-def kind='lvalue' type-id='type-id-387' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-389'/>
     <qualified-type-def type-id='type-id-390' const='yes' id='type-id-391'/>
     <reference-type-def kind='lvalue' type-id='type-id-391' size-in-bits='64' id='type-id-392'/>
     <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-393'/>
     <qualified-type-def type-id='type-id-394' const='yes' id='type-id-395'/>
-    <reference-type-def kind='lvalue' type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
     <qualified-type-def type-id='type-id-397' const='yes' id='type-id-398'/>
     <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-400'/>
-    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-404'/>
-    <qualified-type-def type-id='type-id-405' const='yes' id='type-id-406'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <qualified-type-def type-id='type-id-408' const='yes' id='type-id-409'/>
-    <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-410'/>
-    <qualified-type-def type-id='type-id-411' const='yes' id='type-id-412'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-413'/>
-    <qualified-type-def type-id='type-id-414' const='yes' id='type-id-415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-415' size-in-bits='64' id='type-id-416'/>
-    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-417'/>
-    <qualified-type-def type-id='type-id-418' const='yes' id='type-id-419'/>
-    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-421'/>
-    <reference-type-def kind='lvalue' type-id='type-id-421' size-in-bits='64' id='type-id-422'/>
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-423'/>
-    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-425'/>
-    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-426'/>
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
-    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-431'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-432'/>
-    <qualified-type-def type-id='type-id-433' const='yes' id='type-id-434'/>
-    <reference-type-def kind='lvalue' type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-436'/>
-    <qualified-type-def type-id='type-id-437' const='yes' id='type-id-438'/>
-    <reference-type-def kind='lvalue' type-id='type-id-438' size-in-bits='64' id='type-id-439'/>
-    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-442'/>
+    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-403' const='yes' id='type-id-404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-404' size-in-bits='64' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-406'/>
+    <qualified-type-def type-id='type-id-407' const='yes' id='type-id-408'/>
+    <qualified-type-def type-id='type-id-409' const='yes' id='type-id-410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-412'/>
+    <qualified-type-def type-id='type-id-413' const='yes' id='type-id-414'/>
+    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-415'/>
+    <qualified-type-def type-id='type-id-416' const='yes' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-420'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-421'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-423'/>
+    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-425'/>
+    <qualified-type-def type-id='type-id-426' const='yes' id='type-id-427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-428'/>
+    <qualified-type-def type-id='type-id-429' const='yes' id='type-id-430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
+    <qualified-type-def type-id='type-id-432' const='yes' id='type-id-433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-434'/>
+    <qualified-type-def type-id='type-id-435' const='yes' id='type-id-436'/>
+    <reference-type-def kind='lvalue' type-id='type-id-436' size-in-bits='64' id='type-id-437'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-438'/>
+    <qualified-type-def type-id='type-id-439' const='yes' id='type-id-440'/>
+    <reference-type-def kind='lvalue' type-id='type-id-440' size-in-bits='64' id='type-id-441'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-442'/>
     <qualified-type-def type-id='type-id-443' const='yes' id='type-id-444'/>
     <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-445'/>
     <qualified-type-def type-id='type-id-446' const='yes' id='type-id-447'/>
     <reference-type-def kind='lvalue' type-id='type-id-447' size-in-bits='64' id='type-id-448'/>
-    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-450' const='yes' id='type-id-451'/>
-    <reference-type-def kind='lvalue' type-id='type-id-451' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-453'/>
-    <qualified-type-def type-id='type-id-454' const='yes' id='type-id-455'/>
-    <reference-type-def kind='lvalue' type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-457' const='yes' id='type-id-458'/>
-    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-450' size-in-bits='64' id='type-id-451'/>
+    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-453'/>
+    <reference-type-def kind='lvalue' type-id='type-id-453' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-456' const='yes' id='type-id-457'/>
+    <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-459'/>
     <qualified-type-def type-id='type-id-460' const='yes' id='type-id-461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-462'/>
     <qualified-type-def type-id='type-id-463' const='yes' id='type-id-464'/>
     <reference-type-def kind='lvalue' type-id='type-id-464' size-in-bits='64' id='type-id-465'/>
-    <pointer-type-def type-id='type-id-464' size-in-bits='64' id='type-id-466'/>
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-468'/>
-    <reference-type-def kind='lvalue' type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-471' const='yes' id='type-id-472'/>
-    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
-    <qualified-type-def type-id='type-id-474' const='yes' id='type-id-475'/>
-    <reference-type-def kind='lvalue' type-id='type-id-475' size-in-bits='64' id='type-id-476'/>
+    <qualified-type-def type-id='type-id-466' const='yes' id='type-id-467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-467' size-in-bits='64' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-469'/>
+    <qualified-type-def type-id='type-id-470' const='yes' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-472'/>
+    <qualified-type-def type-id='type-id-473' const='yes' id='type-id-474'/>
+    <reference-type-def kind='lvalue' type-id='type-id-474' size-in-bits='64' id='type-id-475'/>
+    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-476'/>
     <qualified-type-def type-id='type-id-477' const='yes' id='type-id-478'/>
     <reference-type-def kind='lvalue' type-id='type-id-478' size-in-bits='64' id='type-id-479'/>
     <pointer-type-def type-id='type-id-478' size-in-bits='64' id='type-id-480'/>
     <qualified-type-def type-id='type-id-481' const='yes' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-484' const='yes' id='type-id-485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-485' size-in-bits='64' id='type-id-486'/>
-    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-487'/>
-    <qualified-type-def type-id='type-id-488' const='yes' id='type-id-489'/>
-    <reference-type-def kind='lvalue' type-id='type-id-489' size-in-bits='64' id='type-id-490'/>
-    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-482' size-in-bits='64' id='type-id-483'/>
+    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-484'/>
+    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-486'/>
+    <reference-type-def kind='lvalue' type-id='type-id-486' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-488'/>
+    <qualified-type-def type-id='type-id-489' const='yes' id='type-id-490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-490' size-in-bits='64' id='type-id-491'/>
     <qualified-type-def type-id='type-id-492' const='yes' id='type-id-493'/>
     <reference-type-def kind='lvalue' type-id='type-id-493' size-in-bits='64' id='type-id-494'/>
     <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-495'/>
@@ -1329,9 +1328,9 @@
     <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-499'/>
     <qualified-type-def type-id='type-id-500' const='yes' id='type-id-501'/>
     <reference-type-def kind='lvalue' type-id='type-id-501' size-in-bits='64' id='type-id-502'/>
-    <qualified-type-def type-id='type-id-503' const='yes' id='type-id-504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-504' size-in-bits='64' id='type-id-505'/>
-    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-503'/>
+    <qualified-type-def type-id='type-id-504' const='yes' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-506'/>
     <qualified-type-def type-id='type-id-507' const='yes' id='type-id-508'/>
     <reference-type-def kind='lvalue' type-id='type-id-508' size-in-bits='64' id='type-id-509'/>
     <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-510'/>
@@ -1339,439 +1338,439 @@
     <reference-type-def kind='lvalue' type-id='type-id-512' size-in-bits='64' id='type-id-513'/>
     <pointer-type-def type-id='type-id-512' size-in-bits='64' id='type-id-514'/>
     <qualified-type-def type-id='type-id-515' const='yes' id='type-id-516'/>
-    <pointer-type-def type-id='type-id-516' size-in-bits='64' id='type-id-517'/>
+    <reference-type-def kind='lvalue' type-id='type-id-516' size-in-bits='64' id='type-id-517'/>
     <qualified-type-def type-id='type-id-518' const='yes' id='type-id-519'/>
     <reference-type-def kind='lvalue' type-id='type-id-519' size-in-bits='64' id='type-id-520'/>
-    <pointer-type-def type-id='type-id-519' size-in-bits='64' id='type-id-521'/>
-    <qualified-type-def type-id='type-id-522' const='yes' id='type-id-523'/>
-    <reference-type-def kind='lvalue' type-id='type-id-523' size-in-bits='64' id='type-id-524'/>
-    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-525'/>
-    <qualified-type-def type-id='type-id-526' const='yes' id='type-id-527'/>
-    <reference-type-def kind='lvalue' type-id='type-id-527' size-in-bits='64' id='type-id-528'/>
-    <qualified-type-def type-id='type-id-529' const='yes' id='type-id-530'/>
-    <reference-type-def kind='lvalue' type-id='type-id-530' size-in-bits='64' id='type-id-531'/>
-    <qualified-type-def type-id='type-id-532' const='yes' id='type-id-533'/>
-    <pointer-type-def type-id='type-id-533' size-in-bits='64' id='type-id-534'/>
-    <qualified-type-def type-id='type-id-535' const='yes' id='type-id-536'/>
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-537'/>
+    <qualified-type-def type-id='type-id-521' const='yes' id='type-id-522'/>
+    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-523'/>
+    <qualified-type-def type-id='type-id-524' const='yes' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-526'/>
+    <qualified-type-def type-id='type-id-527' const='yes' id='type-id-528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-528' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-528' size-in-bits='64' id='type-id-530'/>
+    <qualified-type-def type-id='type-id-531' const='yes' id='type-id-532'/>
+    <reference-type-def kind='lvalue' type-id='type-id-532' size-in-bits='64' id='type-id-533'/>
+    <qualified-type-def type-id='type-id-534' const='yes' id='type-id-535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-535' size-in-bits='64' id='type-id-536'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-537'/>
     <qualified-type-def type-id='type-id-538' const='yes' id='type-id-539'/>
     <reference-type-def kind='lvalue' type-id='type-id-539' size-in-bits='64' id='type-id-540'/>
     <pointer-type-def type-id='type-id-539' size-in-bits='64' id='type-id-541'/>
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-543'/>
     <reference-type-def kind='lvalue' type-id='type-id-543' size-in-bits='64' id='type-id-544'/>
-    <qualified-type-def type-id='type-id-545' const='yes' id='type-id-546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-547'/>
-    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-543' size-in-bits='64' id='type-id-545'/>
+    <qualified-type-def type-id='type-id-546' const='yes' id='type-id-547'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-548'/>
     <qualified-type-def type-id='type-id-549' const='yes' id='type-id-550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-550' size-in-bits='64' id='type-id-551'/>
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-552'/>
-    <qualified-type-def type-id='type-id-553' const='yes' id='type-id-554'/>
-    <reference-type-def kind='lvalue' type-id='type-id-554' size-in-bits='64' id='type-id-555'/>
-    <pointer-type-def type-id='type-id-554' size-in-bits='64' id='type-id-556'/>
-    <qualified-type-def type-id='type-id-557' const='yes' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-558' size-in-bits='64' id='type-id-559'/>
-    <qualified-type-def type-id='type-id-560' const='yes' id='type-id-561'/>
-    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
-    <qualified-type-def type-id='type-id-563' const='yes' id='type-id-564'/>
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-565'/>
-    <qualified-type-def type-id='type-id-566' const='yes' id='type-id-567'/>
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-568'/>
-    <qualified-type-def type-id='type-id-569' const='yes' id='type-id-570'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-571'/>
-    <qualified-type-def type-id='type-id-572' const='yes' id='type-id-573'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-574'/>
-    <qualified-type-def type-id='type-id-575' const='yes' id='type-id-576'/>
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-577'/>
-    <qualified-type-def type-id='type-id-578' const='yes' id='type-id-579'/>
-    <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-580'/>
-    <qualified-type-def type-id='type-id-581' const='yes' id='type-id-582'/>
-    <pointer-type-def type-id='type-id-582' size-in-bits='64' id='type-id-583'/>
-    <qualified-type-def type-id='type-id-584' const='yes' id='type-id-585'/>
-    <pointer-type-def type-id='type-id-585' size-in-bits='64' id='type-id-586'/>
-    <qualified-type-def type-id='type-id-587' const='yes' id='type-id-588'/>
-    <pointer-type-def type-id='type-id-588' size-in-bits='64' id='type-id-589'/>
-    <qualified-type-def type-id='type-id-590' const='yes' id='type-id-591'/>
-    <pointer-type-def type-id='type-id-591' size-in-bits='64' id='type-id-592'/>
-    <qualified-type-def type-id='type-id-593' const='yes' id='type-id-594'/>
-    <pointer-type-def type-id='type-id-594' size-in-bits='64' id='type-id-595'/>
-    <qualified-type-def type-id='type-id-596' const='yes' id='type-id-597'/>
-    <pointer-type-def type-id='type-id-597' size-in-bits='64' id='type-id-598'/>
-    <qualified-type-def type-id='type-id-599' const='yes' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-600' size-in-bits='64' id='type-id-601'/>
-    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-604'/>
-    <qualified-type-def type-id='type-id-605' const='yes' id='type-id-606'/>
-    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-607'/>
-    <qualified-type-def type-id='type-id-608' const='yes' id='type-id-609'/>
-    <pointer-type-def type-id='type-id-609' size-in-bits='64' id='type-id-610'/>
-    <qualified-type-def type-id='type-id-611' const='yes' id='type-id-612'/>
-    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-613'/>
-    <qualified-type-def type-id='type-id-614' const='yes' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-615' size-in-bits='64' id='type-id-616'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-551'/>
+    <qualified-type-def type-id='type-id-552' const='yes' id='type-id-553'/>
+    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-554'/>
+    <qualified-type-def type-id='type-id-555' const='yes' id='type-id-556'/>
+    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-557'/>
+    <qualified-type-def type-id='type-id-558' const='yes' id='type-id-559'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-560'/>
+    <qualified-type-def type-id='type-id-561' const='yes' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-563'/>
+    <qualified-type-def type-id='type-id-564' const='yes' id='type-id-565'/>
+    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-566'/>
+    <qualified-type-def type-id='type-id-567' const='yes' id='type-id-568'/>
+    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-569'/>
+    <qualified-type-def type-id='type-id-570' const='yes' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-572'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-574'/>
+    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-575'/>
+    <qualified-type-def type-id='type-id-576' const='yes' id='type-id-577'/>
+    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-578'/>
+    <qualified-type-def type-id='type-id-579' const='yes' id='type-id-580'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-581'/>
+    <qualified-type-def type-id='type-id-582' const='yes' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-584'/>
+    <qualified-type-def type-id='type-id-585' const='yes' id='type-id-586'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-587'/>
+    <qualified-type-def type-id='type-id-588' const='yes' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-589' size-in-bits='64' id='type-id-590'/>
+    <qualified-type-def type-id='type-id-591' const='yes' id='type-id-592'/>
+    <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-593'/>
+    <qualified-type-def type-id='type-id-594' const='yes' id='type-id-595'/>
+    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-596'/>
+    <qualified-type-def type-id='type-id-597' const='yes' id='type-id-598'/>
+    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-599'/>
+    <qualified-type-def type-id='type-id-600' const='yes' id='type-id-601'/>
+    <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-602'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-604'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-605'/>
+    <qualified-type-def type-id='type-id-606' const='yes' id='type-id-607'/>
+    <pointer-type-def type-id='type-id-607' size-in-bits='64' id='type-id-608'/>
+    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-609'/>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-610'/>
+    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-611'/>
+    <qualified-type-def type-id='type-id-612' const='yes' id='type-id-613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-614'/>
+    <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-615'/>
+    <qualified-type-def type-id='type-id-615' const='yes' id='type-id-616'/>
     <qualified-type-def type-id='type-id-617' const='yes' id='type-id-618'/>
     <pointer-type-def type-id='type-id-618' size-in-bits='64' id='type-id-619'/>
-    <qualified-type-def type-id='type-id-29' const='yes' id='type-id-620'/>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-621'/>
-    <qualified-type-def type-id='type-id-46' const='yes' id='type-id-622'/>
-    <qualified-type-def type-id='type-id-623' const='yes' id='type-id-624'/>
-    <reference-type-def kind='lvalue' type-id='type-id-624' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-626'/>
-    <qualified-type-def type-id='type-id-626' const='yes' id='type-id-627'/>
+    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-621' size-in-bits='64' id='type-id-622'/>
+    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-623'/>
+    <qualified-type-def type-id='type-id-624' const='yes' id='type-id-625'/>
+    <reference-type-def kind='lvalue' type-id='type-id-625' size-in-bits='64' id='type-id-626'/>
+    <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-627'/>
     <qualified-type-def type-id='type-id-628' const='yes' id='type-id-629'/>
-    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
-    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
-    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
+    <pointer-type-def type-id='type-id-629' size-in-bits='64' id='type-id-631'/>
+    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-633'/>
+    <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-634'/>
     <qualified-type-def type-id='type-id-635' const='yes' id='type-id-636'/>
     <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-637'/>
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-638'/>
-    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
-    <pointer-type-def type-id='type-id-640' size-in-bits='64' id='type-id-642'/>
-    <qualified-type-def type-id='type-id-643' const='yes' id='type-id-644'/>
-    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
-    <qualified-type-def type-id='type-id-646' const='yes' id='type-id-647'/>
-    <reference-type-def kind='lvalue' type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-650'/>
-    <reference-type-def kind='lvalue' type-id='type-id-650' size-in-bits='64' id='type-id-651'/>
-    <qualified-type-def type-id='type-id-652' const='yes' id='type-id-653'/>
-    <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-654'/>
-    <qualified-type-def type-id='type-id-655' const='yes' id='type-id-656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-656' size-in-bits='64' id='type-id-657'/>
-    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-658'/>
-    <qualified-type-def type-id='type-id-659' const='yes' id='type-id-660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-661'/>
-    <qualified-type-def type-id='type-id-662' const='yes' id='type-id-663'/>
-    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-664'/>
-    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-666'/>
-    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
-    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-669'/>
-    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-672'/>
-    <reference-type-def kind='lvalue' type-id='type-id-672' size-in-bits='64' id='type-id-673'/>
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-675'/>
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
-    <qualified-type-def type-id='type-id-677' const='yes' id='type-id-678'/>
-    <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
-    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-681'/>
-    <reference-type-def kind='lvalue' type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
-    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-684'/>
-    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
-    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-687'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-688'/>
-    <qualified-type-def type-id='type-id-689' const='yes' id='type-id-690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
-    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-693'/>
-    <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-694'/>
+    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-647'/>
+    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-649' size-in-bits='64' id='type-id-650'/>
+    <qualified-type-def type-id='type-id-651' const='yes' id='type-id-652'/>
+    <reference-type-def kind='lvalue' type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
+    <qualified-type-def type-id='type-id-654' const='yes' id='type-id-655'/>
+    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
+    <qualified-type-def type-id='type-id-657' const='yes' id='type-id-658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-658' size-in-bits='64' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
+    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-664' size-in-bits='64' id='type-id-665'/>
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-671'/>
+    <qualified-type-def type-id='type-id-672' const='yes' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-673' size-in-bits='64' id='type-id-674'/>
+    <qualified-type-def type-id='type-id-675' const='yes' id='type-id-676'/>
+    <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-677'/>
+    <qualified-type-def type-id='type-id-678' const='yes' id='type-id-679'/>
+    <reference-type-def kind='lvalue' type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
+    <qualified-type-def type-id='type-id-681' const='yes' id='type-id-682'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
+    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-685'/>
+    <reference-type-def kind='lvalue' type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
+    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-691' const='yes' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-694'/>
     <qualified-type-def type-id='type-id-695' const='yes' id='type-id-696'/>
     <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-697'/>
-    <qualified-type-def type-id='type-id-698' const='yes' id='type-id-699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-698'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
     <qualified-type-def type-id='type-id-702' const='yes' id='type-id-703'/>
     <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-704'/>
     <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-705'/>
     <qualified-type-def type-id='type-id-706' const='yes' id='type-id-707'/>
     <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-708'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-709'/>
-    <qualified-type-def type-id='type-id-710' const='yes' id='type-id-711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
-    <qualified-type-def type-id='type-id-713' const='yes' id='type-id-714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-714' size-in-bits='64' id='type-id-715'/>
-    <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-716'/>
-    <qualified-type-def type-id='type-id-717' const='yes' id='type-id-718'/>
-    <reference-type-def kind='lvalue' type-id='type-id-718' size-in-bits='64' id='type-id-719'/>
-    <qualified-type-def type-id='type-id-720' const='yes' id='type-id-721'/>
-    <reference-type-def kind='lvalue' type-id='type-id-721' size-in-bits='64' id='type-id-722'/>
-    <qualified-type-def type-id='type-id-723' const='yes' id='type-id-724'/>
-    <reference-type-def kind='lvalue' type-id='type-id-724' size-in-bits='64' id='type-id-725'/>
-    <pointer-type-def type-id='type-id-724' size-in-bits='64' id='type-id-726'/>
-    <qualified-type-def type-id='type-id-727' const='yes' id='type-id-728'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
-    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-731'/>
-    <reference-type-def kind='lvalue' type-id='type-id-731' size-in-bits='64' id='type-id-732'/>
-    <qualified-type-def type-id='type-id-733' const='yes' id='type-id-734'/>
-    <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-735'/>
-    <qualified-type-def type-id='type-id-736' const='yes' id='type-id-737'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-738'/>
-    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-739'/>
-    <qualified-type-def type-id='type-id-740' const='yes' id='type-id-741'/>
-    <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-742'/>
-    <qualified-type-def type-id='type-id-743' const='yes' id='type-id-744'/>
-    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-745'/>
-    <qualified-type-def type-id='type-id-746' const='yes' id='type-id-747'/>
-    <reference-type-def kind='lvalue' type-id='type-id-747' size-in-bits='64' id='type-id-748'/>
-    <qualified-type-def type-id='type-id-749' const='yes' id='type-id-750'/>
-    <reference-type-def kind='lvalue' type-id='type-id-750' size-in-bits='64' id='type-id-751'/>
-    <qualified-type-def type-id='type-id-752' const='yes' id='type-id-753'/>
-    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-754'/>
-    <qualified-type-def type-id='type-id-755' const='yes' id='type-id-756'/>
-    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-757'/>
-    <qualified-type-def type-id='type-id-758' const='yes' id='type-id-759'/>
-    <reference-type-def kind='lvalue' type-id='type-id-759' size-in-bits='64' id='type-id-760'/>
-    <qualified-type-def type-id='type-id-761' const='yes' id='type-id-762'/>
-    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-709' const='yes' id='type-id-710'/>
+    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
+    <qualified-type-def type-id='type-id-712' const='yes' id='type-id-713'/>
+    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-715'/>
+    <qualified-type-def type-id='type-id-716' const='yes' id='type-id-717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
+    <qualified-type-def type-id='type-id-719' const='yes' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-720' size-in-bits='64' id='type-id-721'/>
+    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-723'/>
+    <reference-type-def kind='lvalue' type-id='type-id-723' size-in-bits='64' id='type-id-724'/>
+    <qualified-type-def type-id='type-id-725' const='yes' id='type-id-726'/>
+    <reference-type-def kind='lvalue' type-id='type-id-726' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-726' size-in-bits='64' id='type-id-728'/>
+    <qualified-type-def type-id='type-id-729' const='yes' id='type-id-730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-730' size-in-bits='64' id='type-id-731'/>
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
+    <qualified-type-def type-id='type-id-735' const='yes' id='type-id-736'/>
+    <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-737'/>
+    <qualified-type-def type-id='type-id-738' const='yes' id='type-id-739'/>
+    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-741' const='yes' id='type-id-742'/>
+    <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-743'/>
+    <qualified-type-def type-id='type-id-744' const='yes' id='type-id-745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-745' size-in-bits='64' id='type-id-746'/>
+    <qualified-type-def type-id='type-id-747' const='yes' id='type-id-748'/>
+    <reference-type-def kind='lvalue' type-id='type-id-748' size-in-bits='64' id='type-id-749'/>
+    <qualified-type-def type-id='type-id-750' const='yes' id='type-id-751'/>
+    <pointer-type-def type-id='type-id-751' size-in-bits='64' id='type-id-752'/>
+    <qualified-type-def type-id='type-id-753' const='yes' id='type-id-754'/>
+    <reference-type-def kind='lvalue' type-id='type-id-754' size-in-bits='64' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-756' const='yes' id='type-id-757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-757' size-in-bits='64' id='type-id-758'/>
+    <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-759'/>
+    <qualified-type-def type-id='type-id-760' const='yes' id='type-id-761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-762'/>
+    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-763'/>
     <qualified-type-def type-id='type-id-764' const='yes' id='type-id-765'/>
-    <reference-type-def kind='lvalue' type-id='type-id-765' size-in-bits='64' id='type-id-766'/>
+    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-766'/>
     <qualified-type-def type-id='type-id-767' const='yes' id='type-id-768'/>
     <reference-type-def kind='lvalue' type-id='type-id-768' size-in-bits='64' id='type-id-769'/>
     <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-770'/>
     <qualified-type-def type-id='type-id-771' const='yes' id='type-id-772'/>
     <reference-type-def kind='lvalue' type-id='type-id-772' size-in-bits='64' id='type-id-773'/>
-    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-774'/>
-    <qualified-type-def type-id='type-id-775' const='yes' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-777'/>
-    <qualified-type-def type-id='type-id-778' const='yes' id='type-id-779'/>
-    <reference-type-def kind='lvalue' type-id='type-id-779' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-779' size-in-bits='64' id='type-id-781'/>
-    <qualified-type-def type-id='type-id-782' const='yes' id='type-id-783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-784'/>
-    <qualified-type-def type-id='type-id-785' const='yes' id='type-id-786'/>
-    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-787'/>
-    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-790'/>
-    <qualified-type-def type-id='type-id-791' const='yes' id='type-id-792'/>
-    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-793'/>
-    <qualified-type-def type-id='type-id-794' const='yes' id='type-id-795'/>
-    <reference-type-def kind='lvalue' type-id='type-id-795' size-in-bits='64' id='type-id-796'/>
-    <qualified-type-def type-id='type-id-797' const='yes' id='type-id-798'/>
-    <reference-type-def kind='lvalue' type-id='type-id-798' size-in-bits='64' id='type-id-799'/>
-    <qualified-type-def type-id='type-id-800' const='yes' id='type-id-801'/>
-    <reference-type-def kind='lvalue' type-id='type-id-801' size-in-bits='64' id='type-id-802'/>
-    <qualified-type-def type-id='type-id-803' const='yes' id='type-id-804'/>
-    <reference-type-def kind='lvalue' type-id='type-id-804' size-in-bits='64' id='type-id-805'/>
-    <qualified-type-def type-id='type-id-806' const='yes' id='type-id-807'/>
-    <reference-type-def kind='lvalue' type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
-    <qualified-type-def type-id='type-id-809' const='yes' id='type-id-810'/>
-    <reference-type-def kind='lvalue' type-id='type-id-810' size-in-bits='64' id='type-id-811'/>
-    <qualified-type-def type-id='type-id-812' const='yes' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-813' size-in-bits='64' id='type-id-814'/>
-    <qualified-type-def type-id='type-id-815' const='yes' id='type-id-816'/>
-    <reference-type-def kind='lvalue' type-id='type-id-816' size-in-bits='64' id='type-id-817'/>
-    <qualified-type-def type-id='type-id-818' const='yes' id='type-id-819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-819' size-in-bits='64' id='type-id-820'/>
-    <qualified-type-def type-id='type-id-821' const='yes' id='type-id-822'/>
-    <pointer-type-def type-id='type-id-822' size-in-bits='64' id='type-id-823'/>
-    <qualified-type-def type-id='type-id-824' const='yes' id='type-id-825'/>
-    <reference-type-def kind='lvalue' type-id='type-id-825' size-in-bits='64' id='type-id-826'/>
-    <qualified-type-def type-id='type-id-827' const='yes' id='type-id-828'/>
-    <reference-type-def kind='lvalue' type-id='type-id-828' size-in-bits='64' id='type-id-829'/>
-    <qualified-type-def type-id='type-id-830' const='yes' id='type-id-831'/>
-    <pointer-type-def type-id='type-id-831' size-in-bits='64' id='type-id-832'/>
-    <qualified-type-def type-id='type-id-833' const='yes' id='type-id-834'/>
-    <reference-type-def kind='lvalue' type-id='type-id-834' size-in-bits='64' id='type-id-835'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-837'/>
-    <reference-type-def kind='lvalue' type-id='type-id-837' size-in-bits='64' id='type-id-838'/>
-    <qualified-type-def type-id='type-id-839' const='yes' id='type-id-840'/>
-    <pointer-type-def type-id='type-id-840' size-in-bits='64' id='type-id-841'/>
-    <qualified-type-def type-id='type-id-842' const='yes' id='type-id-843'/>
-    <reference-type-def kind='lvalue' type-id='type-id-843' size-in-bits='64' id='type-id-844'/>
-    <qualified-type-def type-id='type-id-845' const='yes' id='type-id-846'/>
-    <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-847'/>
-    <qualified-type-def type-id='type-id-848' const='yes' id='type-id-849'/>
-    <pointer-type-def type-id='type-id-849' size-in-bits='64' id='type-id-850'/>
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-852'/>
-    <reference-type-def kind='lvalue' type-id='type-id-852' size-in-bits='64' id='type-id-853'/>
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-855'/>
-    <reference-type-def kind='lvalue' type-id='type-id-855' size-in-bits='64' id='type-id-856'/>
-    <qualified-type-def type-id='type-id-857' const='yes' id='type-id-858'/>
-    <pointer-type-def type-id='type-id-858' size-in-bits='64' id='type-id-859'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-861'/>
-    <reference-type-def kind='lvalue' type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <qualified-type-def type-id='type-id-863' const='yes' id='type-id-864'/>
-    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-865'/>
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-867'/>
-    <pointer-type-def type-id='type-id-867' size-in-bits='64' id='type-id-868'/>
-    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-870' size-in-bits='64' id='type-id-871'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-873' size-in-bits='64' id='type-id-874'/>
-    <qualified-type-def type-id='type-id-875' const='yes' id='type-id-876'/>
-    <reference-type-def kind='lvalue' type-id='type-id-876' size-in-bits='64' id='type-id-877'/>
-    <pointer-type-def type-id='type-id-876' size-in-bits='64' id='type-id-878'/>
-    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-881'/>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-883'/>
-    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-884'/>
-    <qualified-type-def type-id='type-id-885' const='yes' id='type-id-886'/>
-    <reference-type-def kind='lvalue' type-id='type-id-886' size-in-bits='64' id='type-id-887'/>
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-889'/>
-    <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-890'/>
-    <qualified-type-def type-id='type-id-891' const='yes' id='type-id-892'/>
-    <pointer-type-def type-id='type-id-892' size-in-bits='64' id='type-id-893'/>
+    <qualified-type-def type-id='type-id-774' const='yes' id='type-id-775'/>
+    <reference-type-def kind='lvalue' type-id='type-id-775' size-in-bits='64' id='type-id-776'/>
+    <qualified-type-def type-id='type-id-777' const='yes' id='type-id-778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-779'/>
+    <qualified-type-def type-id='type-id-780' const='yes' id='type-id-781'/>
+    <reference-type-def kind='lvalue' type-id='type-id-781' size-in-bits='64' id='type-id-782'/>
+    <qualified-type-def type-id='type-id-783' const='yes' id='type-id-784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-784' size-in-bits='64' id='type-id-785'/>
+    <qualified-type-def type-id='type-id-786' const='yes' id='type-id-787'/>
+    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-788'/>
+    <qualified-type-def type-id='type-id-789' const='yes' id='type-id-790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-790' size-in-bits='64' id='type-id-791'/>
+    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-793'/>
+    <reference-type-def kind='lvalue' type-id='type-id-793' size-in-bits='64' id='type-id-794'/>
+    <qualified-type-def type-id='type-id-795' const='yes' id='type-id-796'/>
+    <reference-type-def kind='lvalue' type-id='type-id-796' size-in-bits='64' id='type-id-797'/>
+    <qualified-type-def type-id='type-id-798' const='yes' id='type-id-799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-799' size-in-bits='64' id='type-id-800'/>
+    <qualified-type-def type-id='type-id-801' const='yes' id='type-id-802'/>
+    <pointer-type-def type-id='type-id-802' size-in-bits='64' id='type-id-803'/>
+    <qualified-type-def type-id='type-id-804' const='yes' id='type-id-805'/>
+    <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
+    <qualified-type-def type-id='type-id-807' const='yes' id='type-id-808'/>
+    <reference-type-def kind='lvalue' type-id='type-id-808' size-in-bits='64' id='type-id-809'/>
+    <qualified-type-def type-id='type-id-810' const='yes' id='type-id-811'/>
+    <pointer-type-def type-id='type-id-811' size-in-bits='64' id='type-id-812'/>
+    <qualified-type-def type-id='type-id-813' const='yes' id='type-id-814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-814' size-in-bits='64' id='type-id-815'/>
+    <qualified-type-def type-id='type-id-816' const='yes' id='type-id-817'/>
+    <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
+    <qualified-type-def type-id='type-id-819' const='yes' id='type-id-820'/>
+    <pointer-type-def type-id='type-id-820' size-in-bits='64' id='type-id-821'/>
+    <qualified-type-def type-id='type-id-822' const='yes' id='type-id-823'/>
+    <reference-type-def kind='lvalue' type-id='type-id-823' size-in-bits='64' id='type-id-824'/>
+    <qualified-type-def type-id='type-id-825' const='yes' id='type-id-826'/>
+    <reference-type-def kind='lvalue' type-id='type-id-826' size-in-bits='64' id='type-id-827'/>
+    <qualified-type-def type-id='type-id-828' const='yes' id='type-id-829'/>
+    <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-830'/>
+    <qualified-type-def type-id='type-id-831' const='yes' id='type-id-832'/>
+    <reference-type-def kind='lvalue' type-id='type-id-832' size-in-bits='64' id='type-id-833'/>
+    <qualified-type-def type-id='type-id-834' const='yes' id='type-id-835'/>
+    <reference-type-def kind='lvalue' type-id='type-id-835' size-in-bits='64' id='type-id-836'/>
+    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-838'/>
+    <pointer-type-def type-id='type-id-838' size-in-bits='64' id='type-id-839'/>
+    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-841'/>
+    <reference-type-def kind='lvalue' type-id='type-id-841' size-in-bits='64' id='type-id-842'/>
+    <qualified-type-def type-id='type-id-843' const='yes' id='type-id-844'/>
+    <reference-type-def kind='lvalue' type-id='type-id-844' size-in-bits='64' id='type-id-845'/>
+    <qualified-type-def type-id='type-id-846' const='yes' id='type-id-847'/>
+    <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-848'/>
+    <qualified-type-def type-id='type-id-849' const='yes' id='type-id-850'/>
+    <reference-type-def kind='lvalue' type-id='type-id-850' size-in-bits='64' id='type-id-851'/>
+    <qualified-type-def type-id='type-id-852' const='yes' id='type-id-853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-853' size-in-bits='64' id='type-id-854'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-856'/>
+    <pointer-type-def type-id='type-id-856' size-in-bits='64' id='type-id-857'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-859'/>
+    <reference-type-def kind='lvalue' type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
+    <qualified-type-def type-id='type-id-861' const='yes' id='type-id-862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-862' size-in-bits='64' id='type-id-863'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-865'/>
+    <reference-type-def kind='lvalue' type-id='type-id-865' size-in-bits='64' id='type-id-866'/>
+    <pointer-type-def type-id='type-id-865' size-in-bits='64' id='type-id-867'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-870'/>
+    <qualified-type-def type-id='type-id-871' const='yes' id='type-id-872'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-873'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-875'/>
+    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-876'/>
+    <qualified-type-def type-id='type-id-877' const='yes' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-879'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-881'/>
+    <pointer-type-def type-id='type-id-881' size-in-bits='64' id='type-id-882'/>
+    <qualified-type-def type-id='type-id-883' const='yes' id='type-id-884'/>
+    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-885'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-886'/>
+    <qualified-type-def type-id='type-id-887' const='yes' id='type-id-888'/>
+    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-889'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-891'/>
+    <reference-type-def kind='lvalue' type-id='type-id-891' size-in-bits='64' id='type-id-892'/>
+    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-893'/>
     <qualified-type-def type-id='type-id-894' const='yes' id='type-id-895'/>
     <reference-type-def kind='lvalue' type-id='type-id-895' size-in-bits='64' id='type-id-896'/>
-    <pointer-type-def type-id='type-id-895' size-in-bits='64' id='type-id-897'/>
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-899'/>
-    <pointer-type-def type-id='type-id-899' size-in-bits='64' id='type-id-900'/>
-    <qualified-type-def type-id='type-id-901' const='yes' id='type-id-902'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-903'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-904'/>
-    <qualified-type-def type-id='type-id-905' const='yes' id='type-id-906'/>
-    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-907'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-909'/>
-    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-910'/>
-    <qualified-type-def type-id='type-id-911' const='yes' id='type-id-912'/>
-    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-913'/>
-    <qualified-type-def type-id='type-id-914' const='yes' id='type-id-915'/>
-    <reference-type-def kind='lvalue' type-id='type-id-915' size-in-bits='64' id='type-id-916'/>
-    <qualified-type-def type-id='type-id-917' const='yes' id='type-id-918'/>
-    <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-919'/>
-    <qualified-type-def type-id='type-id-920' const='yes' id='type-id-921'/>
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-924'/>
-    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-925'/>
-    <qualified-type-def type-id='type-id-926' const='yes' id='type-id-927'/>
-    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
-    <qualified-type-def type-id='type-id-932' const='yes' id='type-id-933'/>
-    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
+    <qualified-type-def type-id='type-id-897' const='yes' id='type-id-898'/>
+    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-899'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-901'/>
+    <reference-type-def kind='lvalue' type-id='type-id-901' size-in-bits='64' id='type-id-902'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-904'/>
+    <reference-type-def kind='lvalue' type-id='type-id-904' size-in-bits='64' id='type-id-905'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-907'/>
+    <reference-type-def kind='lvalue' type-id='type-id-907' size-in-bits='64' id='type-id-908'/>
+    <qualified-type-def type-id='type-id-909' const='yes' id='type-id-910'/>
+    <reference-type-def kind='lvalue' type-id='type-id-910' size-in-bits='64' id='type-id-911'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-913'/>
+    <reference-type-def kind='lvalue' type-id='type-id-913' size-in-bits='64' id='type-id-914'/>
+    <qualified-type-def type-id='type-id-915' const='yes' id='type-id-916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-916' size-in-bits='64' id='type-id-917'/>
+    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-919'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-922'/>
+    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-923'/>
+    <qualified-type-def type-id='type-id-924' const='yes' id='type-id-925'/>
+    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
+    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-928'/>
+    <reference-type-def kind='lvalue' type-id='type-id-928' size-in-bits='64' id='type-id-929'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-930'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-932'/>
+    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-933'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-934'/>
     <qualified-type-def type-id='type-id-935' const='yes' id='type-id-936'/>
-    <reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
     <qualified-type-def type-id='type-id-938' const='yes' id='type-id-939'/>
     <reference-type-def kind='lvalue' type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-941'/>
-    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-943'/>
-    <reference-type-def kind='lvalue' type-id='type-id-943' size-in-bits='64' id='type-id-944'/>
-    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-945'/>
-    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-947'/>
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-948'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-942'/>
+    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-944'/>
+    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-948'/>
     <qualified-type-def type-id='type-id-949' const='yes' id='type-id-950'/>
     <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
     <qualified-type-def type-id='type-id-952' const='yes' id='type-id-953'/>
     <reference-type-def kind='lvalue' type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-955'/>
-    <qualified-type-def type-id='type-id-956' const='yes' id='type-id-957'/>
-    <reference-type-def kind='lvalue' type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
-    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-959'/>
-    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-961'/>
-    <reference-type-def kind='lvalue' type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
-    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-964'/>
-    <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
-    <qualified-type-def type-id='type-id-966' const='yes' id='type-id-967'/>
-    <reference-type-def kind='lvalue' type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
-    <qualified-type-def type-id='type-id-969' const='yes' id='type-id-970'/>
-    <reference-type-def kind='lvalue' type-id='type-id-970' size-in-bits='64' id='type-id-971'/>
-    <qualified-type-def type-id='type-id-972' const='yes' id='type-id-973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
-    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-976'/>
-    <reference-type-def kind='lvalue' type-id='type-id-976' size-in-bits='64' id='type-id-977'/>
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-979' size-in-bits='64' id='type-id-980'/>
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-982'/>
-    <reference-type-def kind='lvalue' type-id='type-id-982' size-in-bits='64' id='type-id-983'/>
-    <qualified-type-def type-id='type-id-984' const='yes' id='type-id-985'/>
-    <reference-type-def kind='lvalue' type-id='type-id-985' size-in-bits='64' id='type-id-986'/>
-    <qualified-type-def type-id='type-id-987' const='yes' id='type-id-988'/>
-    <reference-type-def kind='lvalue' type-id='type-id-988' size-in-bits='64' id='type-id-989'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
-    <qualified-type-def type-id='type-id-993' const='yes' id='type-id-994'/>
-    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
-    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-997'/>
-    <reference-type-def kind='lvalue' type-id='type-id-997' size-in-bits='64' id='type-id-998'/>
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1000'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
-    <qualified-type-def type-id='type-id-1002' const='yes' id='type-id-1003'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
-    <qualified-type-def type-id='type-id-1005' const='yes' id='type-id-1006'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-1007'/>
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1009'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1010'/>
-    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1013'/>
-    <qualified-type-def type-id='type-id-1014' const='yes' id='type-id-1015'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1018'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1019'/>
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1021'/>
+    <qualified-type-def type-id='type-id-955' const='yes' id='type-id-956'/>
+    <reference-type-def kind='lvalue' type-id='type-id-956' size-in-bits='64' id='type-id-957'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-959'/>
+    <reference-type-def kind='lvalue' type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
+    <qualified-type-def type-id='type-id-961' const='yes' id='type-id-962'/>
+    <reference-type-def kind='lvalue' type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
+    <qualified-type-def type-id='type-id-964' const='yes' id='type-id-965'/>
+    <reference-type-def kind='lvalue' type-id='type-id-965' size-in-bits='64' id='type-id-966'/>
+    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-968'/>
+    <reference-type-def kind='lvalue' type-id='type-id-968' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
+    <reference-type-def kind='lvalue' type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-973' const='yes' id='type-id-974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-975'/>
+    <qualified-type-def type-id='type-id-976' const='yes' id='type-id-977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-978'/>
+    <qualified-type-def type-id='type-id-979' const='yes' id='type-id-980'/>
+    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-983'/>
+    <reference-type-def kind='lvalue' type-id='type-id-983' size-in-bits='64' id='type-id-984'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-987'/>
+    <qualified-type-def type-id='type-id-988' const='yes' id='type-id-989'/>
+    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
+    <qualified-type-def type-id='type-id-991' const='yes' id='type-id-992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
+    <qualified-type-def type-id='type-id-994' const='yes' id='type-id-995'/>
+    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-996'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-998'/>
+    <reference-type-def kind='lvalue' type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
+    <qualified-type-def type-id='type-id-1000' const='yes' id='type-id-1001'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1001' size-in-bits='64' id='type-id-1002'/>
+    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-1004'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
+    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1007'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
+    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1010'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
+    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1016'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1019' size-in-bits='64' id='type-id-1020'/>
+    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1021'/>
     <reference-type-def kind='lvalue' type-id='type-id-1021' size-in-bits='64' id='type-id-1022'/>
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1023'/>
     <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1024'/>
     <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1025'/>
     <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1027'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-1028'/>
     <qualified-type-def type-id='type-id-1029' const='yes' id='type-id-1030'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1030' size-in-bits='64' id='type-id-1031'/>
-    <qualified-type-def type-id='type-id-31' const='yes' id='type-id-1032'/>
+    <qualified-type-def type-id='type-id-1031' const='yes' id='type-id-1032'/>
     <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1034'/>
     <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1035'/>
     <reference-type-def kind='lvalue' type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
-    <qualified-type-def type-id='type-id-1037' const='yes' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1043'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1037'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1039'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1042'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1042' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-1044'/>
     <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-1046'/>
     <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-1047'/>
     <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-1048'/>
     <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
+    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
     <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
     <reference-type-def kind='lvalue' type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-1055'/>
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1059'/>
-    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1061'/>
-    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
+    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1056'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1057'/>
+    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1058'/>
+    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1060'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1062'/>
     <qualified-type-def type-id='type-id-1063' const='yes' id='type-id-1064'/>
     <reference-type-def kind='lvalue' type-id='type-id-1064' size-in-bits='64' id='type-id-1065'/>
-    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1067'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1068'/>
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1069'/>
-    <qualified-type-def type-id='type-id-1070' const='yes' id='type-id-1071'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-1072'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-1073'/>
-    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1077'/>
+    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-1067' const='yes' id='type-id-1068'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-1070'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
+    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-1074'/>
+    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
     <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1079'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1081'/>
-    <qualified-type-def type-id='type-id-1082' const='yes' id='type-id-1083'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-1084'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-1085'/>
-    <qualified-type-def type-id='type-id-1086' const='yes' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-1088'/>
-    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1090'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1093'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
-    <qualified-type-def type-id='type-id-1095' const='yes' id='type-id-1096'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-1097'/>
-    <qualified-type-def type-id='type-id-1098' const='yes' id='type-id-1099'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1102'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
-    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1105'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1108'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-1109'/>
-    <qualified-type-def type-id='type-id-1110' const='yes' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-1112'/>
-    <qualified-type-def type-id='type-id-1113' const='yes' id='type-id-1114'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
-    <qualified-type-def type-id='type-id-1116' const='yes' id='type-id-1117'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-1118'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
+    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1082'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
+    <qualified-type-def type-id='type-id-1084' const='yes' id='type-id-1085'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1091'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1094'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
+    <qualified-type-def type-id='type-id-1096' const='yes' id='type-id-1097'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1100'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
+    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1103'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
+    <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-1112'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-1114'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1116'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1116' size-in-bits='64' id='type-id-1117'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-1118'/>
     <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1120'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1120' size-in-bits='64' id='type-id-1121'/>
     <qualified-type-def type-id='type-id-1122' const='yes' id='type-id-1123'/>
     <reference-type-def kind='lvalue' type-id='type-id-1123' size-in-bits='64' id='type-id-1124'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-1125'/>
-    <qualified-type-def type-id='type-id-1126' const='yes' id='type-id-1127'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1127' size-in-bits='64' id='type-id-1128'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-1129'/>
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1131'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1131' size-in-bits='64' id='type-id-1132'/>
-    <qualified-type-def type-id='type-id-1133' const='yes' id='type-id-1134'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1134' size-in-bits='64' id='type-id-1135'/>
-    <qualified-type-def type-id='type-id-1136' const='yes' id='type-id-1137'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-1138'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-1139'/>
-    <qualified-type-def type-id='type-id-1140' const='yes' id='type-id-1141'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-1142'/>
+    <qualified-type-def type-id='type-id-1125' const='yes' id='type-id-1126'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1127'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1128'/>
+    <qualified-type-def type-id='type-id-1129' const='yes' id='type-id-1130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1130' size-in-bits='64' id='type-id-1131'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1133'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1134'/>
+    <qualified-type-def type-id='type-id-1135' const='yes' id='type-id-1136'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1137'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1138'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1140'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1140' size-in-bits='64' id='type-id-1141'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-1142'/>
     <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1144'/>
     <reference-type-def kind='lvalue' type-id='type-id-1144' size-in-bits='64' id='type-id-1145'/>
     <qualified-type-def type-id='type-id-1146' const='yes' id='type-id-1147'/>
@@ -1779,23 +1778,23 @@
     <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-1149'/>
     <qualified-type-def type-id='type-id-1150' const='yes' id='type-id-1151'/>
     <reference-type-def kind='lvalue' type-id='type-id-1151' size-in-bits='64' id='type-id-1152'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-1153'/>
-    <qualified-type-def type-id='type-id-1154' const='yes' id='type-id-1155'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1156'/>
-    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1158'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1160'/>
-    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1162'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
-    <qualified-type-def type-id='type-id-1164' const='yes' id='type-id-1165'/>
+    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1154'/>
+    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1156'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1156' size-in-bits='64' id='type-id-1157'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-1158'/>
+    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1160'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
+    <qualified-type-def type-id='type-id-1162' const='yes' id='type-id-1163'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1163' size-in-bits='64' id='type-id-1164'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-1165'/>
     <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1167'/>
     <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1168'/>
     <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-1169'/>
     <qualified-type-def type-id='type-id-1170' const='yes' id='type-id-1171'/>
     <reference-type-def kind='lvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-1172'/>
-    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1175'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1176'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-1173'/>
+    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1175'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1175' size-in-bits='64' id='type-id-1176'/>
     <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1178'/>
     <reference-type-def kind='lvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-1179'/>
     <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-1180'/>
@@ -1804,192 +1803,193 @@
     <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1184'/>
     <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
     <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1191'/>
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1193'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-1188'/>
+    <qualified-type-def type-id='type-id-1189' const='yes' id='type-id-1190'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1190' size-in-bits='64' id='type-id-1191'/>
+    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-1192'/>
+    <qualified-type-def type-id='type-id-1193' const='yes' id='type-id-1194'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1194' size-in-bits='64' id='type-id-1195'/>
     <qualified-type-def type-id='type-id-1196' const='yes' id='type-id-1197'/>
     <reference-type-def kind='lvalue' type-id='type-id-1197' size-in-bits='64' id='type-id-1198'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-1199'/>
-    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-1202'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1203'/>
-    <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1206'/>
-    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1208'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
-    <qualified-type-def type-id='type-id-1210' const='yes' id='type-id-1211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
-    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
+    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1200'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1201'/>
+    <qualified-type-def type-id='type-id-1202' const='yes' id='type-id-1203'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1203' size-in-bits='64' id='type-id-1204'/>
+    <qualified-type-def type-id='type-id-1205' const='yes' id='type-id-1206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
+    <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1208'/>
+    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1210'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1211'/>
+    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1214'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1215'/>
     <qualified-type-def type-id='type-id-1216' const='yes' id='type-id-1217'/>
     <reference-type-def kind='lvalue' type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
-    <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1219'/>
-    <qualified-type-def type-id='type-id-1220' const='yes' id='type-id-1221'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1221' size-in-bits='64' id='type-id-1222'/>
+    <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1220'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-1222'/>
     <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1224'/>
     <reference-type-def kind='lvalue' type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
-    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1226'/>
-    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1231'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-1232'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1233'/>
-    <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1235'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1236'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1238'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1238' size-in-bits='64' id='type-id-1239'/>
-    <qualified-type-def type-id='type-id-1240' const='yes' id='type-id-1241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-1242'/>
+    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-1228'/>
+    <qualified-type-def type-id='type-id-1229' const='yes' id='type-id-1230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1231'/>
+    <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1233' size-in-bits='64' id='type-id-1234'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1236'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1236' size-in-bits='64' id='type-id-1237'/>
+    <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1238'/>
+    <qualified-type-def type-id='type-id-1239' const='yes' id='type-id-1240'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-1241'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1242'/>
     <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1244'/>
     <reference-type-def kind='lvalue' type-id='type-id-1244' size-in-bits='64' id='type-id-1245'/>
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1248'/>
-    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1249'/>
-    <qualified-type-def type-id='type-id-1250' const='yes' id='type-id-1251'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1252'/>
-    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-1253'/>
-    <qualified-type-def type-id='type-id-1254' const='yes' id='type-id-1255'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-1256'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-1257'/>
+    <pointer-type-def type-id='type-id-1244' size-in-bits='64' id='type-id-1246'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1248'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1248' size-in-bits='64' id='type-id-1249'/>
+    <pointer-type-def type-id='type-id-1248' size-in-bits='64' id='type-id-1250'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1252'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-1253'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-1254'/>
+    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1256'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1256' size-in-bits='64' id='type-id-1257'/>
     <qualified-type-def type-id='type-id-1258' const='yes' id='type-id-1259'/>
     <reference-type-def kind='lvalue' type-id='type-id-1259' size-in-bits='64' id='type-id-1260'/>
     <pointer-type-def type-id='type-id-1259' size-in-bits='64' id='type-id-1261'/>
     <qualified-type-def type-id='type-id-1262' const='yes' id='type-id-1263'/>
     <reference-type-def kind='lvalue' type-id='type-id-1263' size-in-bits='64' id='type-id-1264'/>
-    <pointer-type-def type-id='type-id-1263' size-in-bits='64' id='type-id-1265'/>
-    <qualified-type-def type-id='type-id-1266' const='yes' id='type-id-1267'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-1268'/>
+    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1266'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1267'/>
+    <pointer-type-def type-id='type-id-1266' size-in-bits='64' id='type-id-1268'/>
     <qualified-type-def type-id='type-id-1269' const='yes' id='type-id-1270'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-1271'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-1272'/>
-    <qualified-type-def type-id='type-id-1273' const='yes' id='type-id-1274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1275'/>
-    <qualified-type-def type-id='type-id-1276' const='yes' id='type-id-1277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1277' size-in-bits='64' id='type-id-1278'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-1279'/>
-    <qualified-type-def type-id='type-id-1280' const='yes' id='type-id-1281'/>
-    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1283'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1284'/>
-    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1286'/>
+    <qualified-type-def type-id='type-id-1271' const='yes' id='type-id-1272'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1272' size-in-bits='64' id='type-id-1273'/>
+    <qualified-type-def type-id='type-id-1274' const='yes' id='type-id-1275'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1275' size-in-bits='64' id='type-id-1276'/>
+    <pointer-type-def type-id='type-id-1275' size-in-bits='64' id='type-id-1277'/>
+    <qualified-type-def type-id='type-id-1278' const='yes' id='type-id-1279'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1279' size-in-bits='64' id='type-id-1280'/>
+    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-1281'/>
+    <pointer-type-def type-id='type-id-1281' size-in-bits='64' id='type-id-1282'/>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-1283'/>
+    <pointer-type-def type-id='type-id-1283' size-in-bits='64' id='type-id-1284'/>
+    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-1285'/>
+    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-1286'/>
     <reference-type-def kind='lvalue' type-id='type-id-1286' size-in-bits='64' id='type-id-1287'/>
-    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1288'/>
-    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1290'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
-    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-1292'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
-    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-1294'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-1288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1288' size-in-bits='64' id='type-id-1289'/>
+    <pointer-type-def type-id='type-id-1288' size-in-bits='64' id='type-id-1290'/>
+    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1291'/>
+    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-1292'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1294'/>
     <pointer-type-def type-id='type-id-1294' size-in-bits='64' id='type-id-1295'/>
-    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-1296'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-1297'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
-    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-1299'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1301'/>
-    <qualified-type-def type-id='type-id-102' const='yes' id='type-id-1302'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-1303'/>
-    <qualified-type-def type-id='type-id-1304' const='yes' id='type-id-1305'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-1306'/>
-    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1307'/>
-    <pointer-type-def type-id='type-id-1307' size-in-bits='64' id='type-id-1308'/>
-    <pointer-type-def type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
-    <reference-type-def kind='lvalue' type-id='type-id-21' size-in-bits='64' id='type-id-1310'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1311'/>
-    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-1312'/>
-    <pointer-type-def type-id='type-id-1313' size-in-bits='64' id='type-id-69'/>
-    <reference-type-def kind='lvalue' type-id='type-id-23' size-in-bits='64' id='type-id-1314'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-1315'/>
-    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-1316'/>
-    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-1317'/>
-    <reference-type-def kind='lvalue' type-id='type-id-28' size-in-bits='64' id='type-id-1318'/>
-    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-1319'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-1320'/>
-    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-1321'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1323'/>
-    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-1324'/>
-    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-1325'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-1326'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-1327'/>
-    <reference-type-def kind='lvalue' type-id='type-id-365' size-in-bits='64' id='type-id-1328'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1329'/>
-    <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1330'/>
-    <reference-type-def kind='rvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1331'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-1332'/>
-    <reference-type-def kind='lvalue' type-id='type-id-376' size-in-bits='64' id='type-id-1333'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1334'/>
-    <qualified-type-def type-id='type-id-1334' const='yes' id='type-id-1335'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1334' size-in-bits='64' id='type-id-1337'/>
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1338'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-1339'/>
-    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1340'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1341'/>
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-1343'/>
-    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-1344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <reference-type-def kind='lvalue' type-id='type-id-397' size-in-bits='64' id='type-id-1347'/>
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1348'/>
-    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-1349'/>
-    <reference-type-def kind='lvalue' type-id='type-id-405' size-in-bits='64' id='type-id-1350'/>
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1351'/>
-    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1352'/>
-    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-1353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-414' size-in-bits='64' id='type-id-1354'/>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-1355'/>
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-1356'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-1359'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-1361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-433' size-in-bits='64' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-1363'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-1366'/>
-    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-1368'/>
-    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-1369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-463' size-in-bits='64' id='type-id-1370'/>
-    <pointer-type-def type-id='type-id-463' size-in-bits='64' id='type-id-1371'/>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-1372'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1374'/>
-    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-1375'/>
-    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1376'/>
-    <reference-type-def kind='rvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1378'/>
-    <reference-type-def kind='lvalue' type-id='type-id-481' size-in-bits='64' id='type-id-1379'/>
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-1380'/>
-    <reference-type-def kind='lvalue' type-id='type-id-484' size-in-bits='64' id='type-id-1381'/>
-    <reference-type-def kind='rvalue' type-id='type-id-484' size-in-bits='64' id='type-id-1382'/>
-    <pointer-type-def type-id='type-id-484' size-in-bits='64' id='type-id-1383'/>
+    <qualified-type-def type-id='type-id-103' const='yes' id='type-id-1296'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
+    <reference-type-def kind='lvalue' type-id='type-id-21' size-in-bits='64' id='type-id-1299'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-1300'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-1301'/>
+    <pointer-type-def type-id='type-id-1302' size-in-bits='64' id='type-id-69'/>
+    <reference-type-def kind='lvalue' type-id='type-id-23' size-in-bits='64' id='type-id-1303'/>
+    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-1304'/>
+    <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-1306'/>
+    <reference-type-def kind='lvalue' type-id='type-id-28' size-in-bits='64' id='type-id-1307'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-1308'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-1309'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-1310'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-1312'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-1313'/>
+    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-1314'/>
+    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-1315'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-1316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1317'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-1318'/>
+    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1319'/>
+    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1320'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-1321'/>
+    <reference-type-def kind='lvalue' type-id='type-id-365' size-in-bits='64' id='type-id-1322'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1323'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1324' size-in-bits='64' id='type-id-1325'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1323' size-in-bits='64' id='type-id-1326'/>
+    <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-1327'/>
+    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-1328'/>
+    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-1329'/>
+    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-1330'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1331'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1332'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1333'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1334' size-in-bits='64' id='type-id-1335'/>
+    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-1336'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1337'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-1338'/>
+    <reference-type-def kind='lvalue' type-id='type-id-394' size-in-bits='64' id='type-id-1339'/>
+    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-1340'/>
+    <reference-type-def kind='lvalue' type-id='type-id-400' size-in-bits='64' id='type-id-1341'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1342'/>
+    <reference-type-def kind='lvalue' type-id='type-id-403' size-in-bits='64' id='type-id-1343'/>
+    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-1344'/>
+    <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-1345'/>
+    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-1348'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1349'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-1350'/>
+    <reference-type-def kind='lvalue' type-id='type-id-422' size-in-bits='64' id='type-id-1351'/>
+    <pointer-type-def type-id='type-id-422' size-in-bits='64' id='type-id-1352'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
+    <pointer-type-def type-id='type-id-432' size-in-bits='64' id='type-id-1356'/>
+    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-1358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-452' size-in-bits='64' id='type-id-1359'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-1360'/>
+    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-1363'/>
+    <pointer-type-def type-id='type-id-460' size-in-bits='64' id='type-id-1364'/>
+    <reference-type-def kind='lvalue' type-id='type-id-466' size-in-bits='64' id='type-id-1365'/>
+    <reference-type-def kind='rvalue' type-id='type-id-466' size-in-bits='64' id='type-id-1366'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-1367'/>
+    <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-1368'/>
+    <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-1369'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-1371'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-1373'/>
+    <qualified-type-def type-id='type-id-1373' const='yes' id='type-id-1374'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1374' size-in-bits='64' id='type-id-1375'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-1376'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1377'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1373' size-in-bits='64' id='type-id-1378'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-1379'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1379' size-in-bits='64' id='type-id-1380'/>
+    <reference-type-def kind='lvalue' type-id='type-id-473' size-in-bits='64' id='type-id-1381'/>
+    <reference-type-def kind='rvalue' type-id='type-id-473' size-in-bits='64' id='type-id-1382'/>
+    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-1383'/>
     <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
     <reference-type-def kind='lvalue' type-id='type-id-1386' size-in-bits='64' id='type-id-1387'/>
-    <reference-type-def kind='lvalue' type-id='type-id-488' size-in-bits='64' id='type-id-1388'/>
-    <pointer-type-def type-id='type-id-488' size-in-bits='64' id='type-id-1389'/>
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-1391'/>
+    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1388'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-1390'/>
+    <pointer-type-def type-id='type-id-485' size-in-bits='64' id='type-id-1391'/>
     <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-503' size-in-bits='64' id='type-id-1394'/>
-    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-1395'/>
-    <reference-type-def kind='lvalue' type-id='type-id-507' size-in-bits='64' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-1397'/>
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-515' size-in-bits='64' id='type-id-1399'/>
-    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-1400'/>
-    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1401'/>
-    <reference-type-def kind='lvalue' type-id='type-id-522' size-in-bits='64' id='type-id-1402'/>
-    <pointer-type-def type-id='type-id-522' size-in-bits='64' id='type-id-1403'/>
+    <reference-type-def kind='lvalue' type-id='type-id-492' size-in-bits='64' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1395'/>
+    <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-1396'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-1397'/>
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-1398'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1399'/>
+    <reference-type-def kind='lvalue' type-id='type-id-507' size-in-bits='64' id='type-id-1400'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-1401'/>
+    <reference-type-def kind='lvalue' type-id='type-id-511' size-in-bits='64' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-1403'/>
     <qualified-type-def type-id='type-id-1403' const='yes' id='type-id-1404'/>
     <reference-type-def kind='lvalue' type-id='type-id-1404' size-in-bits='64' id='type-id-1405'/>
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1406'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-1408'/>
+    <reference-type-def kind='lvalue' type-id='type-id-518' size-in-bits='64' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-518' size-in-bits='64' id='type-id-1407'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-1408'/>
     <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
     <reference-type-def kind='rvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1412'/>
-    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-524' size-in-bits='64' id='type-id-1413'/>
     <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-1415'/>
     <pointer-type-def type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
     <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
@@ -1999,223 +1999,223 @@
     <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1423'/>
     <reference-type-def kind='lvalue' type-id='type-id-1420' size-in-bits='64' id='type-id-1424'/>
     <pointer-type-def type-id='type-id-1420' size-in-bits='64' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-527' size-in-bits='64' id='type-id-1426'/>
     <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-1428'/>
     <qualified-type-def type-id='type-id-1428' const='yes' id='type-id-1429'/>
     <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
     <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-1431'/>
     <reference-type-def kind='lvalue' type-id='type-id-1428' size-in-bits='64' id='type-id-1432'/>
     <pointer-type-def type-id='type-id-1428' size-in-bits='64' id='type-id-1433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-1435'/>
-    <reference-type-def kind='lvalue' type-id='type-id-549' size-in-bits='64' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-549' size-in-bits='64' id='type-id-1437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-534' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-534' size-in-bits='64' id='type-id-1435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1437'/>
     <pointer-type-def type-id='type-id-1438' size-in-bits='64' id='type-id-1439'/>
     <pointer-type-def type-id='type-id-1440' size-in-bits='64' id='type-id-1441'/>
-    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-1442'/>
-    <reference-type-def kind='lvalue' type-id='type-id-557' size-in-bits='64' id='type-id-1443'/>
-    <pointer-type-def type-id='type-id-557' size-in-bits='64' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-1442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-546' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-546' size-in-bits='64' id='type-id-1444'/>
     <reference-type-def kind='lvalue' type-id='type-id-46' size-in-bits='64' id='type-id-1445'/>
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-1446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-623' size-in-bits='64' id='type-id-1448'/>
+    <reference-type-def kind='lvalue' type-id='type-id-612' size-in-bits='64' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-612' size-in-bits='64' id='type-id-1448'/>
     <qualified-type-def type-id='type-id-1448' const='yes' id='type-id-1449'/>
-    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-617' size-in-bits='64' id='type-id-1450'/>
     <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
-    <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-1453'/>
+    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-1453'/>
     <reference-type-def kind='lvalue' type-id='type-id-1454' size-in-bits='64' id='type-id-1455'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-1456'/>
-    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-1457'/>
-    <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-1458'/>
+    <pointer-type-def type-id='type-id-624' size-in-bits='64' id='type-id-1456'/>
+    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-628' size-in-bits='64' id='type-id-1458'/>
     <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
-    <reference-type-def kind='rvalue' type-id='type-id-643' size-in-bits='64' id='type-id-1461'/>
-    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-1462'/>
-    <reference-type-def kind='lvalue' type-id='type-id-646' size-in-bits='64' id='type-id-1463'/>
-    <reference-type-def kind='rvalue' type-id='type-id-646' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='rvalue' type-id='type-id-632' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-1462'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-1463'/>
+    <reference-type-def kind='rvalue' type-id='type-id-635' size-in-bits='64' id='type-id-1464'/>
     <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-1467'/>
-    <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-1468'/>
-    <reference-type-def kind='rvalue' type-id='type-id-655' size-in-bits='64' id='type-id-1469'/>
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-1467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-644' size-in-bits='64' id='type-id-1468'/>
+    <reference-type-def kind='rvalue' type-id='type-id-644' size-in-bits='64' id='type-id-1469'/>
+    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-1470'/>
     <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
     <reference-type-def kind='lvalue' type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
     <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-1476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1477'/>
-    <reference-type-def kind='rvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1478'/>
-    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-1479'/>
-    <reference-type-def kind='lvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1480'/>
-    <reference-type-def kind='rvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1481'/>
-    <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-1482'/>
-    <reference-type-def kind='lvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1483'/>
-    <reference-type-def kind='rvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1484'/>
-    <pointer-type-def type-id='type-id-674' size-in-bits='64' id='type-id-1485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1486'/>
-    <reference-type-def kind='rvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1487'/>
-    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-1488'/>
-    <reference-type-def kind='lvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1489'/>
-    <reference-type-def kind='rvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1490'/>
-    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-1491'/>
-    <reference-type-def kind='lvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1492'/>
-    <reference-type-def kind='rvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1493'/>
-    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-1494'/>
-    <reference-type-def kind='rvalue' type-id='type-id-686' size-in-bits='64' id='type-id-1495'/>
-    <pointer-type-def type-id='type-id-686' size-in-bits='64' id='type-id-1496'/>
+    <reference-type-def kind='lvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='rvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-1479'/>
+    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-1480'/>
+    <reference-type-def kind='rvalue' type-id='type-id-660' size-in-bits='64' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-660' size-in-bits='64' id='type-id-1482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-663' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='rvalue' type-id='type-id-663' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-1485'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-1486'/>
+    <reference-type-def kind='rvalue' type-id='type-id-666' size-in-bits='64' id='type-id-1487'/>
+    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-1488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-1489'/>
+    <reference-type-def kind='rvalue' type-id='type-id-669' size-in-bits='64' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-1491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-672' size-in-bits='64' id='type-id-1492'/>
+    <reference-type-def kind='rvalue' type-id='type-id-672' size-in-bits='64' id='type-id-1493'/>
+    <pointer-type-def type-id='type-id-672' size-in-bits='64' id='type-id-1494'/>
+    <reference-type-def kind='rvalue' type-id='type-id-675' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-1496'/>
     <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1498'/>
-    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1499'/>
-    <reference-type-def kind='rvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1500'/>
-    <reference-type-def kind='rvalue' type-id='type-id-692' size-in-bits='64' id='type-id-1501'/>
-    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-1499'/>
+    <reference-type-def kind='rvalue' type-id='type-id-678' size-in-bits='64' id='type-id-1500'/>
+    <reference-type-def kind='rvalue' type-id='type-id-681' size-in-bits='64' id='type-id-1501'/>
+    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-1502'/>
     <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1505'/>
-    <reference-type-def kind='rvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-698' size-in-bits='64' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-698' size-in-bits='64' id='type-id-1508'/>
-    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1509'/>
-    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-1510'/>
-    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1511'/>
-    <reference-type-def kind='rvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-706' size-in-bits='64' id='type-id-1513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1514'/>
-    <reference-type-def kind='rvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1515'/>
+    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1505'/>
+    <reference-type-def kind='rvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-687' size-in-bits='64' id='type-id-1507'/>
+    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-1508'/>
+    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-1509'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-1510'/>
+    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1511'/>
+    <reference-type-def kind='rvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1512'/>
+    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-1513'/>
+    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='rvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1515'/>
     <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1518'/>
-    <reference-type-def kind='rvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1519'/>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-1520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-717' size-in-bits='64' id='type-id-1521'/>
-    <reference-type-def kind='rvalue' type-id='type-id-717' size-in-bits='64' id='type-id-1522'/>
+    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1518'/>
+    <reference-type-def kind='rvalue' type-id='type-id-702' size-in-bits='64' id='type-id-1519'/>
+    <pointer-type-def type-id='type-id-702' size-in-bits='64' id='type-id-1520'/>
+    <reference-type-def kind='lvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1521'/>
+    <reference-type-def kind='rvalue' type-id='type-id-706' size-in-bits='64' id='type-id-1522'/>
     <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1524'/>
-    <reference-type-def kind='lvalue' type-id='type-id-723' size-in-bits='64' id='type-id-1525'/>
-    <reference-type-def kind='rvalue' type-id='type-id-723' size-in-bits='64' id='type-id-1526'/>
-    <pointer-type-def type-id='type-id-723' size-in-bits='64' id='type-id-1527'/>
-    <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1528'/>
-    <reference-type-def kind='rvalue' type-id='type-id-727' size-in-bits='64' id='type-id-1529'/>
+    <reference-type-def kind='lvalue' type-id='type-id-712' size-in-bits='64' id='type-id-1525'/>
+    <reference-type-def kind='rvalue' type-id='type-id-712' size-in-bits='64' id='type-id-1526'/>
+    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-1527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1528'/>
+    <reference-type-def kind='rvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1529'/>
     <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
-    <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-1532'/>
-    <reference-type-def kind='rvalue' type-id='type-id-736' size-in-bits='64' id='type-id-1533'/>
-    <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-1534'/>
+    <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1532'/>
+    <reference-type-def kind='rvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1533'/>
+    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1534'/>
     <reference-type-def kind='lvalue' type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1537'/>
-    <reference-type-def kind='rvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-729' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='rvalue' type-id='type-id-729' size-in-bits='64' id='type-id-1538'/>
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-1541'/>
-    <reference-type-def kind='lvalue' type-id='type-id-755' size-in-bits='64' id='type-id-1542'/>
-    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-1543'/>
-    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-1544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1545'/>
-    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1547'/>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-1548'/>
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-1549'/>
+    <pointer-type-def type-id='type-id-741' size-in-bits='64' id='type-id-1541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-1542'/>
+    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-1543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-753' size-in-bits='64' id='type-id-1544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-756' size-in-bits='64' id='type-id-1545'/>
+    <pointer-type-def type-id='type-id-756' size-in-bits='64' id='type-id-1546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1547'/>
+    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-1548'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1549'/>
     <qualified-type-def type-id='type-id-1549' const='yes' id='type-id-1550'/>
     <reference-type-def kind='lvalue' type-id='type-id-1550' size-in-bits='64' id='type-id-1551'/>
-    <reference-type-def kind='lvalue' type-id='type-id-778' size-in-bits='64' id='type-id-1552'/>
-    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-1553'/>
-    <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1554'/>
-    <reference-type-def kind='rvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1555'/>
-    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-1557'/>
-    <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1558'/>
-    <reference-type-def kind='rvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1559'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-1560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-791' size-in-bits='64' id='type-id-1561'/>
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1562'/>
-    <reference-type-def kind='rvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1563'/>
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1564'/>
-    <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1566'/>
-    <reference-type-def kind='rvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1567'/>
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1569'/>
-    <reference-type-def kind='rvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1570'/>
-    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1572'/>
-    <reference-type-def kind='rvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1573'/>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1574'/>
-    <reference-type-def kind='lvalue' type-id='type-id-809' size-in-bits='64' id='type-id-1575'/>
+    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1552'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1554'/>
+    <reference-type-def kind='rvalue' type-id='type-id-771' size-in-bits='64' id='type-id-1555'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-1556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-774' size-in-bits='64' id='type-id-1557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-777' size-in-bits='64' id='type-id-1558'/>
+    <reference-type-def kind='rvalue' type-id='type-id-777' size-in-bits='64' id='type-id-1559'/>
+    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-1560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-780' size-in-bits='64' id='type-id-1561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-783' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='rvalue' type-id='type-id-783' size-in-bits='64' id='type-id-1563'/>
+    <pointer-type-def type-id='type-id-783' size-in-bits='64' id='type-id-1564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-786' size-in-bits='64' id='type-id-1565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-1566'/>
+    <reference-type-def kind='rvalue' type-id='type-id-789' size-in-bits='64' id='type-id-1567'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-1568'/>
+    <reference-type-def kind='lvalue' type-id='type-id-792' size-in-bits='64' id='type-id-1569'/>
+    <reference-type-def kind='rvalue' type-id='type-id-792' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-792' size-in-bits='64' id='type-id-1571'/>
+    <reference-type-def kind='lvalue' type-id='type-id-795' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='rvalue' type-id='type-id-795' size-in-bits='64' id='type-id-1573'/>
+    <pointer-type-def type-id='type-id-795' size-in-bits='64' id='type-id-1574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-798' size-in-bits='64' id='type-id-1575'/>
     <reference-type-def kind='lvalue' type-id='type-id-1576' size-in-bits='64' id='type-id-1577'/>
     <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-1578'/>
-    <reference-type-def kind='rvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1579'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-1580'/>
-    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1581'/>
-    <reference-type-def kind='rvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1582'/>
+    <reference-type-def kind='rvalue' type-id='type-id-801' size-in-bits='64' id='type-id-1579'/>
+    <pointer-type-def type-id='type-id-801' size-in-bits='64' id='type-id-1580'/>
+    <reference-type-def kind='lvalue' type-id='type-id-804' size-in-bits='64' id='type-id-1581'/>
+    <reference-type-def kind='rvalue' type-id='type-id-804' size-in-bits='64' id='type-id-1582'/>
     <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1585'/>
-    <reference-type-def kind='rvalue' type-id='type-id-821' size-in-bits='64' id='type-id-1586'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-1587'/>
-    <reference-type-def kind='lvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1588'/>
-    <reference-type-def kind='rvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1589'/>
+    <reference-type-def kind='rvalue' type-id='type-id-810' size-in-bits='64' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-1587'/>
+    <reference-type-def kind='lvalue' type-id='type-id-813' size-in-bits='64' id='type-id-1588'/>
+    <reference-type-def kind='rvalue' type-id='type-id-813' size-in-bits='64' id='type-id-1589'/>
     <reference-type-def kind='lvalue' type-id='type-id-1590' size-in-bits='64' id='type-id-1591'/>
     <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-1592'/>
-    <reference-type-def kind='rvalue' type-id='type-id-830' size-in-bits='64' id='type-id-1593'/>
-    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-1594'/>
-    <reference-type-def kind='lvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1595'/>
-    <reference-type-def kind='rvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1596'/>
+    <reference-type-def kind='rvalue' type-id='type-id-819' size-in-bits='64' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-819' size-in-bits='64' id='type-id-1594'/>
+    <reference-type-def kind='lvalue' type-id='type-id-822' size-in-bits='64' id='type-id-1595'/>
+    <reference-type-def kind='rvalue' type-id='type-id-822' size-in-bits='64' id='type-id-1596'/>
     <reference-type-def kind='lvalue' type-id='type-id-1597' size-in-bits='64' id='type-id-1598'/>
     <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-1599'/>
-    <reference-type-def kind='rvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1600'/>
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1601'/>
-    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1602'/>
-    <reference-type-def kind='rvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1603'/>
+    <reference-type-def kind='rvalue' type-id='type-id-828' size-in-bits='64' id='type-id-1600'/>
+    <pointer-type-def type-id='type-id-828' size-in-bits='64' id='type-id-1601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-831' size-in-bits='64' id='type-id-1602'/>
+    <reference-type-def kind='rvalue' type-id='type-id-831' size-in-bits='64' id='type-id-1603'/>
     <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
     <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1606'/>
-    <reference-type-def kind='rvalue' type-id='type-id-848' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1608'/>
-    <reference-type-def kind='lvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1609'/>
-    <reference-type-def kind='rvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1610'/>
+    <reference-type-def kind='rvalue' type-id='type-id-837' size-in-bits='64' id='type-id-1607'/>
+    <pointer-type-def type-id='type-id-837' size-in-bits='64' id='type-id-1608'/>
+    <reference-type-def kind='lvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1609'/>
+    <reference-type-def kind='rvalue' type-id='type-id-840' size-in-bits='64' id='type-id-1610'/>
     <reference-type-def kind='lvalue' type-id='type-id-1611' size-in-bits='64' id='type-id-1612'/>
     <pointer-type-def type-id='type-id-1611' size-in-bits='64' id='type-id-1613'/>
-    <reference-type-def kind='rvalue' type-id='type-id-857' size-in-bits='64' id='type-id-1614'/>
-    <pointer-type-def type-id='type-id-857' size-in-bits='64' id='type-id-1615'/>
-    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1616'/>
-    <reference-type-def kind='rvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1617'/>
+    <reference-type-def kind='rvalue' type-id='type-id-846' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-846' size-in-bits='64' id='type-id-1615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-849' size-in-bits='64' id='type-id-1616'/>
+    <reference-type-def kind='rvalue' type-id='type-id-849' size-in-bits='64' id='type-id-1617'/>
     <reference-type-def kind='lvalue' type-id='type-id-1618' size-in-bits='64' id='type-id-1619'/>
     <pointer-type-def type-id='type-id-1618' size-in-bits='64' id='type-id-1620'/>
-    <reference-type-def kind='rvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1621'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1622'/>
-    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1623'/>
-    <reference-type-def kind='rvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1624'/>
+    <reference-type-def kind='rvalue' type-id='type-id-855' size-in-bits='64' id='type-id-1621'/>
+    <pointer-type-def type-id='type-id-855' size-in-bits='64' id='type-id-1622'/>
+    <reference-type-def kind='lvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1623'/>
+    <reference-type-def kind='rvalue' type-id='type-id-858' size-in-bits='64' id='type-id-1624'/>
     <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
     <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1627'/>
-    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-1628'/>
-    <pointer-type-def type-id='type-id-875' size-in-bits='64' id='type-id-1629'/>
+    <reference-type-def kind='lvalue' type-id='type-id-864' size-in-bits='64' id='type-id-1628'/>
+    <pointer-type-def type-id='type-id-864' size-in-bits='64' id='type-id-1629'/>
     <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
-    <reference-type-def kind='lvalue' type-id='type-id-888' size-in-bits='64' id='type-id-1632'/>
-    <pointer-type-def type-id='type-id-888' size-in-bits='64' id='type-id-1633'/>
-    <pointer-type-def type-id='type-id-891' size-in-bits='64' id='type-id-1634'/>
-    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1635'/>
-    <pointer-type-def type-id='type-id-894' size-in-bits='64' id='type-id-1636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-877' size-in-bits='64' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-877' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-880' size-in-bits='64' id='type-id-1634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-883' size-in-bits='64' id='type-id-1635'/>
+    <pointer-type-def type-id='type-id-883' size-in-bits='64' id='type-id-1636'/>
     <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1638'/>
-    <pointer-type-def type-id='type-id-898' size-in-bits='64' id='type-id-1639'/>
-    <reference-type-def kind='rvalue' type-id='type-id-901' size-in-bits='64' id='type-id-1640'/>
-    <pointer-type-def type-id='type-id-901' size-in-bits='64' id='type-id-1641'/>
+    <pointer-type-def type-id='type-id-887' size-in-bits='64' id='type-id-1639'/>
+    <reference-type-def kind='rvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1640'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1641'/>
     <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1643'/>
-    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-894' size-in-bits='64' id='type-id-1644'/>
     <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1646'/>
     <pointer-type-def type-id='type-id-1647' size-in-bits='64' id='type-id-1648'/>
-    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1649'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1650'/>
+    <reference-type-def kind='lvalue' type-id='type-id-897' size-in-bits='64' id='type-id-1649'/>
+    <pointer-type-def type-id='type-id-897' size-in-bits='64' id='type-id-1650'/>
     <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
-    <reference-type-def kind='lvalue' type-id='type-id-911' size-in-bits='64' id='type-id-1653'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-1654'/>
-    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1655'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1657'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-1658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1659'/>
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-1660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-1661'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-1662'/>
+    <reference-type-def kind='lvalue' type-id='type-id-900' size-in-bits='64' id='type-id-1653'/>
+    <pointer-type-def type-id='type-id-900' size-in-bits='64' id='type-id-1654'/>
+    <reference-type-def kind='lvalue' type-id='type-id-903' size-in-bits='64' id='type-id-1655'/>
+    <pointer-type-def type-id='type-id-903' size-in-bits='64' id='type-id-1656'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-1657'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-1658'/>
+    <reference-type-def kind='lvalue' type-id='type-id-909' size-in-bits='64' id='type-id-1659'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-1661'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-1662'/>
     <pointer-type-def type-id='type-id-1663' size-in-bits='64' id='type-id-1664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-885' size-in-bits='64' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-874' size-in-bits='64' id='type-id-1665'/>
     <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
     <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-1668'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-1669'/>
-    <reference-type-def kind='rvalue' type-id='type-id-932' size-in-bits='64' id='type-id-1670'/>
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1672'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-1673'/>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-1674'/>
-    <reference-type-def kind='lvalue' type-id='type-id-949' size-in-bits='64' id='type-id-1675'/>
+    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-1669'/>
+    <reference-type-def kind='rvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-1671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-1672'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-1673'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-1674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1675'/>
     <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-1677'/>
     <reference-type-def kind='lvalue' type-id='type-id-1678' size-in-bits='64' id='type-id-1679'/>
     <reference-type-def kind='lvalue' type-id='type-id-1680' size-in-bits='64' id='type-id-1681'/>
@@ -2223,47 +2223,47 @@
     <reference-type-def kind='lvalue' type-id='type-id-1684' size-in-bits='64' id='type-id-1685'/>
     <reference-type-def kind='lvalue' type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
     <reference-type-def kind='lvalue' type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>
-    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-1690'/>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-1691'/>
-    <reference-type-def kind='lvalue' type-id='type-id-956' size-in-bits='64' id='type-id-1692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-956' size-in-bits='64' id='type-id-1693'/>
-    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-1694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-1690'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-1691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1692'/>
+    <reference-type-def kind='rvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1693'/>
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-1694'/>
     <pointer-type-def type-id='type-id-1695' size-in-bits='64' id='type-id-1696'/>
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-1697'/>
-    <reference-type-def kind='lvalue' type-id='type-id-963' size-in-bits='64' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-1699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-966' size-in-bits='64' id='type-id-1700'/>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-1701'/>
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-1702'/>
-    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-1703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-1704'/>
-    <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-1705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-978' size-in-bits='64' id='type-id-1706'/>
-    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-1707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-981' size-in-bits='64' id='type-id-1708'/>
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-1709'/>
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-1710'/>
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-1711'/>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-1712'/>
-    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-1713'/>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-1714'/>
-    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1715'/>
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1716'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-1717'/>
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1718'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1008' size-in-bits='64' id='type-id-1719'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1011' size-in-bits='64' id='type-id-1721'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1014' size-in-bits='64' id='type-id-1723'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1724'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1725'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1020' size-in-bits='64' id='type-id-1726'/>
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1727'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1023' size-in-bits='64' id='type-id-1728'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1729'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1730'/>
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1731'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-1697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-1698'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-1699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-1700'/>
+    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-1701'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-1702'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-1703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-1704'/>
+    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-1705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-967' size-in-bits='64' id='type-id-1706'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-1707'/>
+    <reference-type-def kind='lvalue' type-id='type-id-970' size-in-bits='64' id='type-id-1708'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-1709'/>
+    <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-1710'/>
+    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-1711'/>
+    <pointer-type-def type-id='type-id-979' size-in-bits='64' id='type-id-1712'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-1713'/>
+    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-1714'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-1715'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-1716'/>
+    <reference-type-def kind='lvalue' type-id='type-id-994' size-in-bits='64' id='type-id-1717'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-1718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-997' size-in-bits='64' id='type-id-1719'/>
+    <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1721'/>
+    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1003' size-in-bits='64' id='type-id-1723'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1724'/>
+    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-1725'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1726'/>
+    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1727'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1728'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1729'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1015' size-in-bits='64' id='type-id-1730'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1731'/>
     <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-1733'/>
     <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-1735'/>
     <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-1737'/>
@@ -2271,8 +2271,8 @@
     <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1741'/>
     <pointer-type-def type-id='type-id-1742' size-in-bits='64' id='type-id-1743'/>
     <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-1745'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1029' size-in-bits='64' id='type-id-1746'/>
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1747'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1746'/>
+    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-1748'/>
     <reference-type-def kind='rvalue' type-id='type-id-31' size-in-bits='64' id='type-id-1749'/>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-1750'/>
@@ -2280,70 +2280,70 @@
     <reference-type-def kind='lvalue' type-id='type-id-1751' size-in-bits='64' id='type-id-1752'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1753'/>
     <pointer-type-def type-id='type-id-1754' size-in-bits='64' id='type-id-1755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1037' size-in-bits='64' id='type-id-1756'/>
-    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1757'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1758'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1759'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1052' size-in-bits='64' id='type-id-1760'/>
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1761'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1762'/>
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1763'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1764'/>
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1765'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-1766'/>
-    <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-1767'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1070' size-in-bits='64' id='type-id-1768'/>
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-1769'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1074' size-in-bits='64' id='type-id-1770'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1078' size-in-bits='64' id='type-id-1771'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1078' size-in-bits='64' id='type-id-1772'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1773'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1774'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1775'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-1776'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-1777'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-1778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1756'/>
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1757'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1034' size-in-bits='64' id='type-id-1758'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-1759'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1760'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1761'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1762'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1763'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1049' size-in-bits='64' id='type-id-1764'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1765'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-1766'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1767'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1768'/>
+    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-1769'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1063' size-in-bits='64' id='type-id-1770'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1771'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-1772'/>
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-1773'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-1774'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1776'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-1777'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1778'/>
     <pointer-type-def type-id='type-id-1779' size-in-bits='64' id='type-id-1780'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1781'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1126' size-in-bits='64' id='type-id-1782'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-1783'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-1784'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1785'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1136' size-in-bits='64' id='type-id-1786'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-1787'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1788'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1789'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1790'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1791'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1792'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1793'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1794'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1154' size-in-bits='64' id='type-id-1795'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-1796'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-1797'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1798'/>
-    <reference-type-def kind='rvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1799'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1161' size-in-bits='64' id='type-id-1800'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1115' size-in-bits='64' id='type-id-1781'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1115' size-in-bits='64' id='type-id-1782'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-1783'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1122' size-in-bits='64' id='type-id-1784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1785'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-1786'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-1787'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1132' size-in-bits='64' id='type-id-1788'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1789'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1135' size-in-bits='64' id='type-id-1790'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-1791'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1139' size-in-bits='64' id='type-id-1792'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1139' size-in-bits='64' id='type-id-1793'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-1794'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1143' size-in-bits='64' id='type-id-1795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1796'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1146' size-in-bits='64' id='type-id-1797'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-1798'/>
+    <reference-type-def kind='rvalue' type-id='type-id-735' size-in-bits='64' id='type-id-1799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1800'/>
     <pointer-type-def type-id='type-id-1801' size-in-bits='64' id='type-id-1802'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1803'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1804'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1803'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-1804'/>
     <reference-type-def kind='rvalue' type-id='type-id-1738' size-in-bits='64' id='type-id-1805'/>
     <pointer-type-def type-id='type-id-1806' size-in-bits='64' id='type-id-1807'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1808'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1809'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1810'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1811'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1173' size-in-bits='64' id='type-id-1812'/>
-    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1813'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1814'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1815'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1816'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1817'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1818'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1820'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1821'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1808'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-1810'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1811'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1812'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1813'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1814'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-1815'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1816'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1817'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1818'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1819'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1820'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1821'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-1822'/>
     <reference-type-def kind='lvalue' type-id='type-id-1823' size-in-bits='64' id='type-id-1824'/>
     <reference-type-def kind='lvalue' type-id='type-id-1825' size-in-bits='64' id='type-id-1826'/>
     <reference-type-def kind='rvalue' type-id='type-id-1827' size-in-bits='64' id='type-id-1828'/>
@@ -2354,67 +2354,67 @@
     <reference-type-def kind='rvalue' type-id='type-id-1836' size-in-bits='64' id='type-id-1837'/>
     <reference-type-def kind='rvalue' type-id='type-id-1838' size-in-bits='64' id='type-id-1839'/>
     <reference-type-def kind='rvalue' type-id='type-id-1840' size-in-bits='64' id='type-id-1841'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-1842'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-1843'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1844'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-1845'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1846'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1847'/>
-    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1848'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1849'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-1850'/>
-    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-1851'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-1852'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-1853'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-1854'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-1855'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-1856'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1857'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-1858'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-1859'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1860'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-1861'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-1862'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1863'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1864'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1865'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1866'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-1867'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-1868'/>
-    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-1869'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-1870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1871'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1230' size-in-bits='64' id='type-id-1872'/>
-    <pointer-type-def type-id='type-id-1230' size-in-bits='64' id='type-id-1873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-1875'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-1876'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-1877'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1250' size-in-bits='64' id='type-id-1878'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1250' size-in-bits='64' id='type-id-1879'/>
-    <pointer-type-def type-id='type-id-1250' size-in-bits='64' id='type-id-1880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1881'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1254' size-in-bits='64' id='type-id-1882'/>
-    <pointer-type-def type-id='type-id-1254' size-in-bits='64' id='type-id-1883'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1884'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1885'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1886'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1887'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1888'/>
-    <pointer-type-def type-id='type-id-1262' size-in-bits='64' id='type-id-1889'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1266' size-in-bits='64' id='type-id-1890'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1269' size-in-bits='64' id='type-id-1891'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1269' size-in-bits='64' id='type-id-1892'/>
-    <pointer-type-def type-id='type-id-1269' size-in-bits='64' id='type-id-1893'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-1894'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-1895'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-1896'/>
-    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-1897'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-1898'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1899'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1900'/>
-    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-1901'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1289' size-in-bits='64' id='type-id-1902'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1842'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-1843'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-1844'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-1845'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1846'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-1847'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-1848'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1849'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1850'/>
+    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1852'/>
+    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-1853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1854'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1855'/>
+    <pointer-type-def type-id='type-id-1196' size-in-bits='64' id='type-id-1856'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1199' size-in-bits='64' id='type-id-1857'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1199' size-in-bits='64' id='type-id-1858'/>
+    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-1859'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1860'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1861'/>
+    <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-1862'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1863'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1864'/>
+    <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-1865'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1209' size-in-bits='64' id='type-id-1866'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1212' size-in-bits='64' id='type-id-1867'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1212' size-in-bits='64' id='type-id-1868'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1870'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1871'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-1872'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-1873'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1232' size-in-bits='64' id='type-id-1874'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1875'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1235' size-in-bits='64' id='type-id-1876'/>
+    <pointer-type-def type-id='type-id-1235' size-in-bits='64' id='type-id-1877'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1239' size-in-bits='64' id='type-id-1878'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1239' size-in-bits='64' id='type-id-1879'/>
+    <pointer-type-def type-id='type-id-1239' size-in-bits='64' id='type-id-1880'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1881'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-1882'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-1883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1884'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1247' size-in-bits='64' id='type-id-1885'/>
+    <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-1886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1887'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1251' size-in-bits='64' id='type-id-1888'/>
+    <pointer-type-def type-id='type-id-1251' size-in-bits='64' id='type-id-1889'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-1890'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1891'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-1892'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-1893'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1262' size-in-bits='64' id='type-id-1894'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1895'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1265' size-in-bits='64' id='type-id-1896'/>
+    <pointer-type-def type-id='type-id-1265' size-in-bits='64' id='type-id-1897'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1271' size-in-bits='64' id='type-id-1898'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1899'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1900'/>
+    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-1901'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1278' size-in-bits='64' id='type-id-1902'/>
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-1903'/>
     <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-1904'/>
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-1905'/>
@@ -2425,11 +2425,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-1910'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-1911'/>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-1912'/>
-    <pointer-type-def type-id='type-id-1913' size-in-bits='64' id='type-id-1914'/>
-    <pointer-type-def type-id='type-id-1915' size-in-bits='64' id='type-id-62'/>
-    <qualified-type-def type-id='type-id-875' volatile='yes' id='type-id-1304'/>
-    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1916'/>
-    <qualified-type-def type-id='type-id-1029' volatile='yes' id='type-id-1917'/>
+    <pointer-type-def type-id='type-id-1913' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-1914' size-in-bits='64' id='type-id-1915'/>
+    <qualified-type-def type-id='type-id-864' volatile='yes' id='type-id-1293'/>
+    <pointer-type-def type-id='type-id-1293' size-in-bits='64' id='type-id-1916'/>
+    <qualified-type-def type-id='type-id-1018' volatile='yes' id='type-id-1917'/>
     <pointer-type-def type-id='type-id-1917' size-in-bits='64' id='type-id-1918'/>
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-1919'/>
     <pointer-type-def type-id='type-id-1919' size-in-bits='64' id='type-id-1920'/>
@@ -2503,29 +2503,29 @@
     <reference-type-def kind='lvalue' type-id='type-id-2010' size-in-bits='64' id='type-id-2014'/>
     <pointer-type-def type-id='type-id-2010' size-in-bits='64' id='type-id-2015'/>
     <namespace-decl name='std'>
-      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1837' column='1' id='type-id-652'>
+      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1837' column='1' id='type-id-641'>
         <member-type access='public'>
           <class-decl name='_Base_manager&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1844' column='1' id='type-id-2016'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;mongo::Status(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE21_M_not_empty_functionIS5_EEbRKPT_' filepath='/usr/include/c++/4.9/functional' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE21_M_not_empty_functionIS5_EEbRKPT_'>
-                <parameter type-id='type-id-214'/>
+                <parameter type-id='type-id-1375'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_' filepath='/usr/include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-217'/>
+                <parameter type-id='type-id-1378'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation' filepath='/usr/include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE10_M_managerERSt9_Any_dataRKS8_St18_Manager_operation'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-625'/>
+                <parameter type-id='type-id-614'/>
                 <parameter type-id='type-id-2017'/>
                 <return type-id='type-id-1'/>
               </function-decl>
@@ -2533,21 +2533,21 @@
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/functional' line='1950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE15_M_init_functorERSt9_Any_dataOS6_St17integral_constantIbLb1EE'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-217'/>
+                <parameter type-id='type-id-1378'/>
                 <parameter type-id='type-id-2018'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-625'/>
-                <return type-id='type-id-218'/>
+                <parameter type-id='type-id-614'/>
+                <return type-id='type-id-1379'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE8_M_cloneERSt9_Any_dataRKS8_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/functional' line='1868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerIPFN5mongo6StatusEPNS1_18InitializerContextEEE8_M_cloneERSt9_Any_dataRKS8_St17integral_constantIbLb1EE'>
                 <parameter type-id='type-id-1447'/>
-                <parameter type-id='type-id-625'/>
+                <parameter type-id='type-id-614'/>
                 <parameter type-id='type-id-2018'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -2565,13 +2565,13 @@
           <typedef-decl name='_Manager_type' type-id='type-id-179' filepath='/usr/include/c++/4.9/functional' line='2005' column='1' id='type-id-2019'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1840' column='1'/>
+          <var-decl name='_M_max_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1840' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_align' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1841' column='1'/>
+          <var-decl name='_M_max_align' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1841' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_functor' type-id='type-id-623' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2007' column='1'/>
+          <var-decl name='_M_functor' type-id='type-id-612' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2007' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_manager' type-id='type-id-2019' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2008' column='1'/>
@@ -2607,19 +2607,19 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2016'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFN5mongo6StatusEPNS0_18InitializerContextEEPS4_E9_M_invokeERKSt9_Any_dataS3_' filepath='/usr/include/c++/4.9/functional' line='2022' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFN5mongo6StatusEPNS0_18InitializerContextEEPS4_E9_M_invokeERKSt9_Any_dataS3_'>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-1363'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-614'/>
+            <parameter type-id='type-id-1352'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Hashtable&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-655'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-908'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
+      <class-decl name='_Hashtable&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-644'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-897'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-918'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2021'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-946'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-882'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-901'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-935'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-871'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-890'/>
         <member-type access='private'>
           <typedef-decl name='__bucket_type' type-id='type-id-1642' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1471'/>
         </member-type>
@@ -2627,19 +2627,19 @@
           <typedef-decl name='__hash_code' type-id='type-id-2023' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-2022'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__hashtable_alloc' type-id='type-id-901' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1473'/>
+          <typedef-decl name='__hashtable_alloc' type-id='type-id-890' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1473'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__node_base' type-id='type-id-1645' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1475'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__rehash_state' type-id='type-id-2024' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-659'/>
+          <typedef-decl name='__rehash_state' type-id='type-id-2024' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-648'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1017' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-662'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1006' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-651'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_equal' type-id='type-id-1074' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-665'/>
+          <typedef-decl name='key_equal' type-id='type-id-1063' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-654'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2026' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-2025'/>
@@ -2657,16 +2657,16 @@
           <var-decl name='_M_buckets' type-id='type-id-1472' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='313' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bucket_count' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
+          <var-decl name='_M_bucket_count' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_before_begin' type-id='type-id-1475' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='315' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_element_count' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
+          <var-decl name='_M_element_count' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='_M_rehash_policy' type-id='type-id-942' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
+          <var-decl name='_M_rehash_policy' type-id='type-id-931' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
           <var-decl name='_M_single_bucket' type-id='type-id-1471' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='325' column='1'/>
@@ -2674,20 +2674,20 @@
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-929'/>
+            <parameter type-id='type-id-870'/>
+            <parameter type-id='type-id-1065'/>
             <parameter type-id='type-id-940'/>
-            <parameter type-id='type-id-881'/>
-            <parameter type-id='type-id-1076'/>
-            <parameter type-id='type-id-951'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1096' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2701,8 +2701,8 @@
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2710,24 +2710,24 @@
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='1171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <parameter type-id='type-id-1469'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
-            <parameter type-id='type-id-667'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2735,10 +2735,10 @@
           <function-decl name='_Hashtable' filepath='/usr/include/c++/4.9/bits/hashtable.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1470' is-artificial='yes'/>
             <parameter type-id='type-id-2033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1084'/>
-            <parameter type-id='type-id-667'/>
-            <parameter type-id='type-id-664'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1073'/>
+            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2750,10 +2750,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-686'>
+      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-675'>
         <member-type access='protected'>
           <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1497'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-990'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-979'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_node' type-id='type-id-1666' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
@@ -2766,7 +2766,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1498' is-artificial='yes'/>
-                <parameter type-id='type-id-691'/>
+                <parameter type-id='type-id-680'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -2786,13 +2786,13 @@
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2034' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-689'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2034' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-678'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_Tp_alloc_type' type-id='type-id-2036' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2035'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-984' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1130'/>
+          <typedef-decl name='allocator_type' type-id='type-id-973' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1119'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1497' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
@@ -2806,7 +2806,7 @@
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1496' is-artificial='yes'/>
-            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-680'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2863,10 +2863,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-692'>
+      <class-decl name='_List_base&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-681'>
         <member-type access='protected'>
           <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1503'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-993'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-982'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_node' type-id='type-id-1666' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
@@ -2879,7 +2879,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1504' is-artificial='yes'/>
-                <parameter type-id='type-id-697'/>
+                <parameter type-id='type-id-686'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -2899,13 +2899,13 @@
           </class-decl>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2037' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-695'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2037' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-684'/>
         </member-type>
         <member-type access='protected'>
           <typedef-decl name='_Tp_alloc_type' type-id='type-id-2039' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2038'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-987' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1140'/>
+          <typedef-decl name='allocator_type' type-id='type-id-976' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1129'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1503' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
@@ -2919,7 +2919,7 @@
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1502' is-artificial='yes'/>
-            <parameter type-id='type-id-697'/>
+            <parameter type-id='type-id-686'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -2984,18 +2984,18 @@
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::_Identity&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-706'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::_Identity&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-695'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1516'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-996'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-985'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3006,15 +3006,15 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1517' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-712'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-701'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1517' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1515'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3022,10 +3022,10 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2042' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-710'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2042' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-699'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1284' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2043'/>
+          <typedef-decl name='const_reference' type-id='type-id-1273' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2043'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Const_Link_type' type-id='type-id-1958' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2044'/>
@@ -3057,30 +3057,30 @@
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-708'/>
+            <parameter type-id='type-id-697'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
-            <parameter type-id='type-id-708'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-697'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3095,7 +3095,7 @@
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1513' is-artificial='yes'/>
             <parameter type-id='type-id-1512'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3115,18 +3115,18 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-713'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-702'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1523'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-999'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-988'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3137,15 +3137,15 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1524' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-719'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-708'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1524' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1522'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3153,10 +3153,10 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2055' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-717'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2055' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-706'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1014' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-720'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1003' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-709'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Const_Link_type' type-id='type-id-1962' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2056'/>
@@ -3194,30 +3194,30 @@
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-715'/>
+            <parameter type-id='type-id-704'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
-            <parameter type-id='type-id-715'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-704'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3232,7 +3232,7 @@
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1520' is-artificial='yes'/>
             <parameter type-id='type-id-1519'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3252,18 +3252,18 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-723'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-712'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1530'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1002'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-991'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3274,15 +3274,15 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1531' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-729'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-718'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1531' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1529'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3290,19 +3290,19 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Link_type' type-id='type-id-770' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2068'/>
+          <typedef-decl name='_Const_Link_type' type-id='type-id-759' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2068'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Link_type' type-id='type-id-1546' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2069'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-727'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2070' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-716'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1020' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-730'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1009' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-719'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-735' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2071'/>
+          <typedef-decl name='const_reference' type-id='type-id-724' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2071'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2073' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2072'/>
@@ -3328,30 +3328,30 @@
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-714'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-725'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-714'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3366,7 +3366,7 @@
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1527' is-artificial='yes'/>
             <parameter type-id='type-id-1526'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3386,18 +3386,18 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-736'>
+      <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='346' column='1' id='type-id-725'>
         <member-type access='protected'>
           <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='455' column='1' id='type-id-1539'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1005'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-994'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-1122' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-1111' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='457' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_header' type-id='type-id-775' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
+              <var-decl name='_M_header' type-id='type-id-764' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='458' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='459' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3408,15 +3408,15 @@
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1540' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
-                <parameter type-id='type-id-742'/>
+                <parameter type-id='type-id-1113'/>
+                <parameter type-id='type-id-731'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1540' is-artificial='yes'/>
-                <parameter type-id='type-id-1124'/>
+                <parameter type-id='type-id-1113'/>
                 <parameter type-id='type-id-1538'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -3436,28 +3436,28 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Link_type' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2080'/>
+          <typedef-decl name='_Const_Link_type' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='365' column='1' id='type-id-2080'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Link_type' type-id='type-id-1548' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='364' column='1' id='type-id-2081'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-2082' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-740'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-2082' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='349' column='1' id='type-id-729'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-743'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1012' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='368' column='1' id='type-id-732'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-752' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2083'/>
+          <typedef-decl name='const_iterator' type-id='type-id-741' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='585' column='1' id='type-id-2083'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-751' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2084'/>
+          <typedef-decl name='const_reference' type-id='type-id-740' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='363' column='1' id='type-id-2084'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-761' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-758'/>
+          <typedef-decl name='iterator' type-id='type-id-750' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='584' column='1' id='type-id-747'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-746'/>
+          <typedef-decl name='key_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='358' column='1' id='type-id-735'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-2086' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='588' column='1' id='type-id-2085'/>
@@ -3477,30 +3477,30 @@
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='666' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='670' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-738'/>
+            <parameter type-id='type-id-727'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='688' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <parameter type-id='type-id-738'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3515,7 +3515,7 @@
           <function-decl name='_Rb_tree' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='707' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
             <parameter type-id='type-id-1533'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3563,13 +3563,13 @@
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE5beginEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE5beginEv'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <return type-id='type-id-758'/>
+            <return type-id='type-id-747'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE3endEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISsSt4pairIKSsSsESt10_Select1stIS2_ESt4lessISsESaIS2_EE3endEv'>
             <parameter type-id='type-id-1534' is-artificial='yes'/>
-            <return type-id='type-id-758'/>
+            <return type-id='type-id-747'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -3605,7 +3605,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_counted_base&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-778'>
+      <class-decl name='_Sp_counted_base&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-767'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2040'/>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_use_count' type-id='type-id-64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='206' column='1'/>
@@ -3622,7 +3622,7 @@
         <member-function access='private'>
           <function-decl name='_Sp_counted_base' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1553' is-artificial='yes'/>
-            <parameter type-id='type-id-780'/>
+            <parameter type-id='type-id-769'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3669,7 +3669,7 @@
           <typedef-decl name='__type' type-id='type-id-2093' filepath='/usr/include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2091'/>
         </member-type>
       </class-decl>
-      <class-decl name='__shared_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-952'>
+      <class-decl name='__shared_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-941'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_pi' type-id='type-id-1553' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='727' column='1'/>
         </data-member>
@@ -3704,7 +3704,7 @@
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1691' is-artificial='yes'/>
-            <parameter type-id='type-id-954'/>
+            <parameter type-id='type-id-943'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3716,12 +3716,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;mongo::optionenvironment::Constraint, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-956'>
+      <class-decl name='__shared_ptr&lt;mongo::optionenvironment::Constraint, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-945'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_ptr' type-id='type-id-1420' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-952' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-941' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3732,7 +3732,7 @@
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <parameter type-id='type-id-958'/>
+            <parameter type-id='type-id-947'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3772,12 +3772,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;bool&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-960'>
+      <class-decl name='allocator&lt;bool&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-949'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-132'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2095'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-972' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2096'/>
+              <typedef-decl name='other' type-id='type-id-961' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2096'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3790,7 +3790,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1697' is-artificial='yes'/>
-            <parameter type-id='type-id-962'/>
+            <parameter type-id='type-id-951'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3802,12 +3802,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-963'>
+      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-952'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-134'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2097'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-963' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2098'/>
+              <typedef-decl name='other' type-id='type-id-952' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2098'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3826,7 +3826,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <parameter type-id='type-id-965'/>
+            <parameter type-id='type-id-954'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3838,12 +3838,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-966'>
+      <class-decl name='allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-955'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-136'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2101'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-966' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2102'/>
+              <typedef-decl name='other' type-id='type-id-955' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2102'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3862,7 +3862,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <parameter type-id='type-id-968'/>
+            <parameter type-id='type-id-957'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3874,7 +3874,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-969'>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-958'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3885,7 +3885,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1702' is-artificial='yes'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3897,7 +3897,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;long unsigned int&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-972'>
+      <class-decl name='allocator&lt;long unsigned int&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-961'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3908,7 +3908,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1703' is-artificial='yes'/>
-            <parameter type-id='type-id-974'/>
+            <parameter type-id='type-id-963'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3920,12 +3920,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-975'>
+      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-964'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-142'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2105'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-975' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2106'/>
+              <typedef-decl name='other' type-id='type-id-964' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2106'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3944,7 +3944,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1705' is-artificial='yes'/>
-            <parameter type-id='type-id-977'/>
+            <parameter type-id='type-id-966'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3956,17 +3956,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-978'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-967'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-144'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::Constraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2109'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-978' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2110'/>
+              <typedef-decl name='other' type-id='type-id-967' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2110'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1420' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1266'/>
+          <typedef-decl name='value_type' type-id='type-id-1420' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1255'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3977,7 +3977,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1707' is-artificial='yes'/>
-            <parameter type-id='type-id-980'/>
+            <parameter type-id='type-id-969'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -3989,17 +3989,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-981'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-970'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-146'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::KeyConstraint*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2111'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-981' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2112'/>
+              <typedef-decl name='other' type-id='type-id-970' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2112'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1428' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1273'/>
+          <typedef-decl name='value_type' type-id='type-id-1428' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1262'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4010,7 +4010,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1709' is-artificial='yes'/>
-            <parameter type-id='type-id-983'/>
+            <parameter type-id='type-id-972'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4022,19 +4022,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-984'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-973'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-148'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2113'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-984' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2036'/>
+              <typedef-decl name='other' type-id='type-id-973' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2036'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2114'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-990' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2034'/>
+              <typedef-decl name='other' type-id='type-id-979' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2034'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4047,7 +4047,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1710' is-artificial='yes'/>
-            <parameter type-id='type-id-986'/>
+            <parameter type-id='type-id-975'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4059,19 +4059,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-987'>
+      <class-decl name='allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-976'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-150'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2115'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-987' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2039'/>
+              <typedef-decl name='other' type-id='type-id-976' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2039'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2116'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-993' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2037'/>
+              <typedef-decl name='other' type-id='type-id-982' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2037'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4084,7 +4084,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-989'/>
+            <parameter type-id='type-id-978'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4096,7 +4096,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-990'>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-979'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-152'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4107,7 +4107,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1712' is-artificial='yes'/>
-            <parameter type-id='type-id-992'/>
+            <parameter type-id='type-id-981'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4132,7 +4132,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-993'>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-982'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-154'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4143,7 +4143,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1713' is-artificial='yes'/>
-            <parameter type-id='type-id-995'/>
+            <parameter type-id='type-id-984'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4168,7 +4168,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-996'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-985'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-156'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4179,7 +4179,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <parameter type-id='type-id-998'/>
+            <parameter type-id='type-id-987'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4191,7 +4191,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-999'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-988'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-158'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4202,7 +4202,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1715' is-artificial='yes'/>
-            <parameter type-id='type-id-1001'/>
+            <parameter type-id='type-id-990'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4214,7 +4214,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1002'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-991'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-160'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4225,7 +4225,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1716' is-artificial='yes'/>
-            <parameter type-id='type-id-1004'/>
+            <parameter type-id='type-id-993'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4237,10 +4237,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1005'>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-994'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-162'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-771' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2117'/>
+          <typedef-decl name='value_type' type-id='type-id-760' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2117'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4251,7 +4251,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1718' is-artificial='yes'/>
-            <parameter type-id='type-id-1007'/>
+            <parameter type-id='type-id-996'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4276,10 +4276,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1008'>
+      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-997'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-164'/>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-894' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2118'/>
+          <typedef-decl name='value_type' type-id='type-id-883' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2118'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4290,7 +4290,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1720' is-artificial='yes'/>
-            <parameter type-id='type-id-1010'/>
+            <parameter type-id='type-id-999'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4302,19 +4302,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1011'>
+      <class-decl name='allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1000'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-166'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2119'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-996' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2120'/>
+              <typedef-decl name='other' type-id='type-id-985' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2120'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2121'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1011' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2122'/>
+              <typedef-decl name='other' type-id='type-id-1000' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2122'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4327,7 +4327,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1722' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4348,7 +4348,7 @@
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaISsEC2ERKS_' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISsEC2ERKS_'>
             <parameter type-id='type-id-1722' is-artificial='yes'/>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4359,12 +4359,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1014'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1003'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-168'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2123'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-999' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2124'/>
+              <typedef-decl name='other' type-id='type-id-988' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2124'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4383,7 +4383,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1724' is-artificial='yes'/>
-            <parameter type-id='type-id-1016'/>
+            <parameter type-id='type-id-1005'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4395,7 +4395,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1017'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1006'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-170'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4406,7 +4406,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1725' is-artificial='yes'/>
-            <parameter type-id='type-id-1019'/>
+            <parameter type-id='type-id-1008'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4418,17 +4418,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1020'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1009'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-172'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2128'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1002' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2129'/>
+              <typedef-decl name='other' type-id='type-id-991' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2129'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-733'/>
+          <typedef-decl name='value_type' type-id='type-id-1166' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-722'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4439,7 +4439,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1727' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1011'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4451,17 +4451,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1023'>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1012'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-174'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2130'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1005' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2131'/>
+              <typedef-decl name='other' type-id='type-id-994' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2131'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-749'/>
+          <typedef-decl name='value_type' type-id='type-id-1170' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-738'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4472,7 +4472,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1729' is-artificial='yes'/>
-            <parameter type-id='type-id-1025'/>
+            <parameter type-id='type-id-1014'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4484,17 +4484,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1026'>
+      <class-decl name='allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1015'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-176'/>
         <member-type access='public'>
           <class-decl name='rebind&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2132'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1026' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2133'/>
+              <typedef-decl name='other' type-id='type-id-1015' filepath='/usr/include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2133'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1200' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1289'/>
+          <typedef-decl name='value_type' type-id='type-id-1189' filepath='/usr/include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-1278'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4505,7 +4505,7 @@
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1731' is-artificial='yes'/>
-            <parameter type-id='type-id-1028'/>
+            <parameter type-id='type-id-1017'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4527,7 +4527,7 @@
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='112' column='1' id='type-id-31'>
         <member-type access='private'>
           <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='272' column='1' id='type-id-1754'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-969'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-958'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_p' type-id='type-id-39' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='277' column='1'/>
             </data-member>
@@ -4535,20 +4535,20 @@
               <function-decl name='_Alloc_hider' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1755' is-artificial='yes'/>
                 <parameter type-id='type-id-39'/>
-                <parameter type-id='type-id-971'/>
+                <parameter type-id='type-id-960'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1037'>
+          <class-decl name='_Rep' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='155' column='1' id='type-id-1026'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2134'/>
             <data-member access='public' static='yes'>
-              <var-decl name='_S_max_size' type-id='type-id-1041' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='50' column='1'/>
+              <var-decl name='_S_max_size' type-id='type-id-1030' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='50' column='1'/>
             </data-member>
             <data-member access='public' static='yes'>
-              <var-decl name='_S_terminal' type-id='type-id-332' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='55' column='1'/>
+              <var-decl name='_S_terminal' type-id='type-id-321' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='55' column='1'/>
             </data-member>
             <data-member access='public' static='yes'>
               <var-decl name='_S_empty_rep_storage' type-id='type-id-100' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.tcc' line='66' column='1'/>
@@ -4558,10 +4558,10 @@
         <member-type access='private'>
           <class-decl name='_Rep_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='148' column='1' id='type-id-2134'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_length' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='150' column='1'/>
+              <var-decl name='_M_length' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='150' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_capacity' type-id='type-id-1040' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='151' column='1'/>
+              <var-decl name='_M_capacity' type-id='type-id-1029' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='151' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
               <var-decl name='_M_refcount' type-id='type-id-64' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='152' column='1'/>
@@ -4569,7 +4569,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-969' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2135'/>
+          <typedef-decl name='allocator_type' type-id='type-id-958' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='120' column='1' id='type-id-2135'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-120' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='129' column='1' id='type-id-2136'/>
@@ -4584,7 +4584,7 @@
           <typedef-decl name='reference' type-id='type-id-2141' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='123' column='1' id='type-id-2140'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-1280' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1040'/>
+          <typedef-decl name='size_type' type-id='type-id-1269' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='121' column='1' id='type-id-1029'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_reverse_iterator' type-id='type-id-2143' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='130' column='1' id='type-id-2142'/>
@@ -4593,7 +4593,7 @@
           <typedef-decl name='reverse_iterator' type-id='type-id-2145' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='131' column='1' id='type-id-2144'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='npos' type-id='type-id-1041' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='285' column='1'/>
+          <var-decl name='npos' type-id='type-id-1030' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='285' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_dataplus' type-id='type-id-1754' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='289' column='1'/>
@@ -4607,33 +4607,33 @@
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='467' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1040'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1029'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4641,8 +4641,8 @@
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-1040'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1029'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4650,16 +4650,16 @@
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1040'/>
+            <parameter type-id='type-id-1029'/>
             <parameter type-id='type-id-5'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4673,8 +4673,8 @@
         <member-function access='public'>
           <function-decl name='basic_string' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='530' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1750' is-artificial='yes'/>
-            <parameter type-id='type-id-1089'/>
-            <parameter type-id='type-id-971'/>
+            <parameter type-id='type-id-1078'/>
+            <parameter type-id='type-id-960'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4686,11 +4686,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;mongo::Status(mongo::InitializerContext*)&gt;' size-in-bits='256' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2142' column='1' id='type-id-1078'>
+      <class-decl name='function&lt;mongo::Status(mongo::InitializerContext*)&gt;' size-in-bits='256' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2142' column='1' id='type-id-1067'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2146'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-652'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-641'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-210' filepath='/usr/include/c++/4.9/functional' line='2398' column='1' id='type-id-2147'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1371' filepath='/usr/include/c++/4.9/functional' line='2398' column='1' id='type-id-2147'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2147' visibility='default' filepath='/usr/include/c++/4.9/functional' line='2399' column='1'/>
@@ -4710,7 +4710,7 @@
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/include/c++/4.9/functional' line='2404' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-1080'/>
+            <parameter type-id='type-id-1069'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4724,36 +4724,36 @@
         <member-function access='public'>
           <function-decl name='function&lt;mongo::Status (*)(mongo::InitializerContext*), void&gt;' filepath='/usr/include/c++/4.9/functional' line='2418' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
+            <parameter type-id='type-id-1373'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;mongo::Status (*)(mongo::InitializerContext*), void&gt;' mangled-name='_ZNSt8functionIFN5mongo6StatusEPNS0_18InitializerContextEEEC2IPS4_vEET_' filepath='/usr/include/c++/4.9/functional' line='2418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFN5mongo6StatusEPNS0_18InitializerContextEEEC2IPS4_vEET_'>
             <parameter type-id='type-id-1773' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
+            <parameter type-id='type-id-1373'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1086'>
+      <class-decl name='initializer_list&lt;bool&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1075'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-316' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2148'/>
+          <typedef-decl name='const_iterator' type-id='type-id-305' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2148'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-316' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2149'/>
+          <typedef-decl name='iterator' type-id='type-id-305' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2149'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2149' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1775' is-artificial='yes'/>
             <parameter type-id='type-id-2148'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4764,7 +4764,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1089'>
+      <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1078'>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-59' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2150'/>
         </member-type>
@@ -4775,13 +4775,13 @@
           <var-decl name='_M_array' type-id='type-id-2151' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1776' is-artificial='yes'/>
             <parameter type-id='type-id-2150'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4792,24 +4792,24 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1092'>
+      <class-decl name='initializer_list&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1081'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-1034' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2152'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1023' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2152'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-1034' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2153'/>
+          <typedef-decl name='iterator' type-id='type-id-1023' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2153'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2153' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1777' is-artificial='yes'/>
             <parameter type-id='type-id-2152'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4820,24 +4820,24 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1095'>
+      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='47' column='1' id='type-id-1084'>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-1184' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2154'/>
+          <typedef-decl name='const_iterator' type-id='type-id-1173' filepath='/usr/include/c++/4.9/initializer_list' line='55' column='1' id='type-id-2154'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-1184' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2155'/>
+          <typedef-decl name='iterator' type-id='type-id-1173' filepath='/usr/include/c++/4.9/initializer_list' line='54' column='1' id='type-id-2155'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_array' type-id='type-id-2155' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-1280' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-1269' visibility='default' filepath='/usr/include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1778' is-artificial='yes'/>
             <parameter type-id='type-id-2154'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4848,8 +4848,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1126'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-686'/>
+      <class-decl name='list&lt;mongo::optionenvironment::OptionDescription, std::allocator&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1115'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-675'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2157' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2156'/>
         </member-type>
@@ -4857,7 +4857,7 @@
           <typedef-decl name='reference' type-id='type-id-2159' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2158'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-545' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1133'/>
+          <typedef-decl name='value_type' type-id='type-id-534' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1122'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2161' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2160'/>
@@ -4880,30 +4880,30 @@
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1135'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1124'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
-            <parameter type-id='type-id-1128'/>
+            <parameter type-id='type-id-1117'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4918,7 +4918,7 @@
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1783' is-artificial='yes'/>
             <parameter type-id='type-id-2168'/>
-            <parameter type-id='type-id-1132'/>
+            <parameter type-id='type-id-1121'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4929,8 +4929,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1136'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-692'/>
+      <class-decl name='list&lt;mongo::optionenvironment::OptionSection, std::allocator&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1125'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-681'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2170' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2169'/>
         </member-type>
@@ -4938,7 +4938,7 @@
           <typedef-decl name='reference' type-id='type-id-2172' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2171'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-549' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1143'/>
+          <typedef-decl name='value_type' type-id='type-id-538' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1132'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2174' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2173'/>
@@ -4961,30 +4961,30 @@
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1145'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1134'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
-            <parameter type-id='type-id-1138'/>
+            <parameter type-id='type-id-1127'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -4999,7 +4999,7 @@
           <function-decl name='list' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1787' is-artificial='yes'/>
             <parameter type-id='type-id-2181'/>
-            <parameter type-id='type-id-1142'/>
+            <parameter type-id='type-id-1131'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5010,9 +5010,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1146'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::ServerParameter*&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1135'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-713' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2182'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-702' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2182'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2183'/>
@@ -5047,15 +5047,15 @@
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1148'/>
+            <parameter type-id='type-id-1137'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5070,23 +5070,23 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-2188'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
-            <parameter type-id='type-id-1148'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-1137'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5094,7 +5094,7 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-1790'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5102,17 +5102,17 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1791' is-artificial='yes'/>
             <parameter type-id='type-id-2188'/>
-            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-711'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1150'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1139'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-723' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2189'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-712' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2189'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-553' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1154'/>
+          <typedef-decl name='mapped_type' type-id='type-id-542' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1143'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2190'/>
@@ -5141,15 +5141,15 @@
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1152'/>
+            <parameter type-id='type-id-1141'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5164,23 +5164,23 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
-            <parameter type-id='type-id-1152'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-1141'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5188,7 +5188,7 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-1793'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5196,26 +5196,26 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1794' is-artificial='yes'/>
             <parameter type-id='type-id-2195'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1157'>
+      <class-decl name='map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='96' column='1' id='type-id-1146'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-736' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2196'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-725' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='135' column='1' id='type-id-2196'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2083' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='150' column='1' id='type-id-2197'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-758' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2198'/>
+          <typedef-decl name='iterator' type-id='type-id-747' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='149' column='1' id='type-id-2198'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_compare' type-id='type-id-1122' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2199'/>
+          <typedef-decl name='key_compare' type-id='type-id-1111' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='102' column='1' id='type-id-2199'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1161'/>
+          <typedef-decl name='mapped_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='100' column='1' id='type-id-1150'/>
         </member-type>
         <member-type access='private'>
           <class-decl name='value_compare' visibility='default' is-declaration-only='yes' id='type-id-2200'/>
@@ -5238,15 +5238,15 @@
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1148'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5260,24 +5260,24 @@
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1095'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1159'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1148'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5285,15 +5285,15 @@
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
             <parameter type-id='type-id-1797'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='map' filepath='/usr/include/c++/4.9/bits/stl_map.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1798' is-artificial='yes'/>
-            <parameter type-id='type-id-1095'/>
-            <parameter type-id='type-id-745'/>
+            <parameter type-id='type-id-1084'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5318,49 +5318,49 @@
       </class-decl>
       <class-decl name='mersenne_twister_engine&lt;long unsigned int, 32ul, 624ul, 397ul, 31ul, 2567483615ul, 11ul, 4294967295ul, 7ul, 2636928640ul, 15ul, 4022730752ul, 18ul, 1812433253ul&gt;' size-in-bits='40000' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='451' column='1' id='type-id-1801'>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-1164'/>
+          <typedef-decl name='result_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/random.h' line='482' column='1' id='type-id-1153'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='word_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='485' column='1'/>
+          <var-decl name='word_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='485' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='state_size' type-id='type-id-622' mangled-name='_ZNSt23mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EE10state_sizeE' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='486' column='1'/>
+          <var-decl name='state_size' type-id='type-id-611' mangled-name='_ZNSt23mersenne_twister_engineImLm32ELm624ELm397ELm31ELm2567483615ELm11ELm4294967295ELm7ELm2636928640ELm15ELm4022730752ELm18ELm1812433253EE10state_sizeE' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='486' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='shift_size' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='487' column='1'/>
+          <var-decl name='shift_size' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='487' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='mask_bits' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='488' column='1'/>
+          <var-decl name='mask_bits' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='488' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='xor_mask' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='489' column='1'/>
+          <var-decl name='xor_mask' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='489' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_u' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='490' column='1'/>
+          <var-decl name='tempering_u' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='490' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_d' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='491' column='1'/>
+          <var-decl name='tempering_d' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='491' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_s' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='492' column='1'/>
+          <var-decl name='tempering_s' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='492' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_b' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='493' column='1'/>
+          <var-decl name='tempering_b' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='493' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_t' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='494' column='1'/>
+          <var-decl name='tempering_t' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='494' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_c' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='495' column='1'/>
+          <var-decl name='tempering_c' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='495' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='tempering_l' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='496' column='1'/>
+          <var-decl name='tempering_l' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='496' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='initialization_multiplier' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='497' column='1'/>
+          <var-decl name='initialization_multiplier' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='497' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='default_seed' type-id='type-id-1165' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='498' column='1'/>
+          <var-decl name='default_seed' type-id='type-id-1154' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='498' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_x' type-id='type-id-98' visibility='default' filepath='/usr/include/c++/4.9/bits/random.h' line='621' column='1'/>
@@ -5371,12 +5371,12 @@
         <member-function access='public'>
           <function-decl name='mersenne_twister_engine' filepath='/usr/include/c++/4.9/bits/random.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1802' is-artificial='yes'/>
-            <parameter type-id='type-id-1164'/>
+            <parameter type-id='type-id-1153'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='move_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-1166'>
+      <class-decl name='move_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-1155'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-1805' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-2203'/>
         </member-type>
@@ -5411,24 +5411,24 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt13move_iteratorIPSsEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPSsEdeEv'>
-            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <return type-id='type-id-2203'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNKSt13move_iteratorIPSsE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPSsE4baseEv'>
-            <parameter type-id='type-id-1169' is-artificial='yes'/>
+            <parameter type-id='type-id-1158' is-artificial='yes'/>
             <return type-id='type-id-2204'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Bit_const_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1188'>
+      <class-decl name='reverse_iterator&lt;std::_Bit_const_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1177'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2205'/>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-2207' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='111' column='1' id='type-id-2206'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2208'/>
+          <typedef-decl name='iterator_type' type-id='type-id-617' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2208'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2210' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2209'/>
@@ -5437,7 +5437,7 @@
           <typedef-decl name='reference' type-id='type-id-2212' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2211'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='current' type-id='type-id-628' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
+          <var-decl name='current' type-id='type-id-617' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5455,15 +5455,15 @@
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1179'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Bit_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1192'>
+      <class-decl name='reverse_iterator&lt;std::_Bit_iterator&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='97' column='1' id='type-id-1181'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2213'/>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-631' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2214'/>
+          <typedef-decl name='iterator_type' type-id='type-id-620' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='110' column='1' id='type-id-2214'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2216' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='112' column='1' id='type-id-2215'/>
@@ -5472,7 +5472,7 @@
           <typedef-decl name='reference' type-id='type-id-2218' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='113' column='1' id='type-id-2217'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='current' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
+          <var-decl name='current' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='105' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5490,17 +5490,17 @@
         <member-function access='public'>
           <function-decl name='reverse_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1845' is-artificial='yes'/>
-            <parameter type-id='type-id-1194'/>
+            <parameter type-id='type-id-1183'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='set&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='90' column='1' id='type-id-1196'>
+      <class-decl name='set&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='90' column='1' id='type-id-1185'>
         <member-type access='private'>
-          <typedef-decl name='_Rep_type' type-id='type-id-706' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1' id='type-id-2219'/>
+          <typedef-decl name='_Rep_type' type-id='type-id-695' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='115' column='1' id='type-id-2219'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_compare' type-id='type-id-1122' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='106' column='1' id='type-id-2220'/>
+          <typedef-decl name='value_compare' type-id='type-id-1111' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='106' column='1' id='type-id-2220'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2047' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='131' column='1' id='type-id-2221'/>
@@ -5523,15 +5523,15 @@
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1198'/>
+            <parameter type-id='type-id-1187'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5545,24 +5545,24 @@
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-1124'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-1113'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1198'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1187'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5570,21 +5570,21 @@
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
             <parameter type-id='type-id-1847'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set' filepath='/usr/include/c++/4.9/bits/stl_set.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1848' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;mongo::optionenvironment::Constraint&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1200'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-956'/>
+      <class-decl name='shared_ptr&lt;mongo::optionenvironment::Constraint&gt;' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1189'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1851' is-artificial='yes'/>
@@ -5594,7 +5594,7 @@
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-1202'/>
+            <parameter type-id='type-id-1191'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5620,8 +5620,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1207'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-782'/>
+      <class-decl name='tuple&lt;mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1196'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-771'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
@@ -5631,15 +5631,15 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1325'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1856' is-artificial='yes'/>
-            <parameter type-id='type-id-1209'/>
+            <parameter type-id='type-id-1198'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5651,8 +5651,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1210'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
+      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1199'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-777'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
@@ -5663,14 +5663,14 @@
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
             <parameter type-id='type-id-2224'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1859' is-artificial='yes'/>
-            <parameter type-id='type-id-1212'/>
+            <parameter type-id='type-id-1201'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5682,8 +5682,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1213'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-794'/>
+      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='523' column='1' id='type-id-1202'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-783'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
@@ -5693,15 +5693,15 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1862' is-artificial='yes'/>
-            <parameter type-id='type-id-1215'/>
+            <parameter type-id='type-id-1204'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5713,19 +5713,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;mongo::BSONObjBuilder, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1216'>
+      <class-decl name='unique_ptr&lt;mongo::BSONObjBuilder, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1205'>
         <member-type access='private'>
           <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2225'>
             <member-type access='public'>
-              <typedef-decl name='type' type-id='type-id-1334' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2226'/>
+              <typedef-decl name='type' type-id='type-id-1323' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2226'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1207' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2227'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1196' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2227'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='deleter_type' type-id='type-id-1066' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1220'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1055' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1209'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2226' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2228'/>
@@ -5785,7 +5785,7 @@
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-1218'/>
+            <parameter type-id='type-id-1207'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5803,7 +5803,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1223'>
+      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1212'>
         <member-type access='private'>
           <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2230'>
             <member-type access='public'>
@@ -5812,10 +5812,10 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1210' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2233'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1199' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2233'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='deleter_type' type-id='type-id-1070' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1227'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1059' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1216'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2231' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2234'/>
@@ -5875,47 +5875,47 @@
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-1225'/>
+            <parameter type-id='type-id-1214'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-2236'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv'>
-            <parameter type-id='type-id-1226' is-artificial='yes'/>
+            <parameter type-id='type-id-1215' is-artificial='yes'/>
             <return type-id='type-id-2234'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unordered_map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1230'>
+      <class-decl name='unordered_map&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1219'>
         <member-type access='private'>
           <typedef-decl name='_Hashtable' type-id='type-id-2238' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-2237'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-662' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1234'/>
+          <typedef-decl name='allocator_type' type-id='type-id-651' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1223'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='hasher' type-id='type-id-2239' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1237'/>
+          <typedef-decl name='hasher' type-id='type-id-2239' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1226'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='key_equal' type-id='type-id-665' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1240'/>
+          <typedef-decl name='key_equal' type-id='type-id-654' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1229'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='mapped_type' type-id='type-id-935' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1243'/>
+          <typedef-decl name='mapped_type' type-id='type-id-924' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1232'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-1040' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2240'/>
+          <typedef-decl name='size_type' type-id='type-id-1029' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2240'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2025' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-2241'/>
@@ -5936,16 +5936,16 @@
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-2240'/>
-            <parameter type-id='type-id-1239'/>
-            <parameter type-id='type-id-1242'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1228'/>
+            <parameter type-id='type-id-1231'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1232'/>
+            <parameter type-id='type-id-1221'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5959,15 +5959,15 @@
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1232'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1221'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5975,7 +5975,7 @@
           <function-decl name='unordered_map' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-1872'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -5984,23 +5984,23 @@
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-2033'/>
             <parameter type-id='type-id-2240'/>
-            <parameter type-id='type-id-1239'/>
-            <parameter type-id='type-id-1242'/>
-            <parameter type-id='type-id-1236'/>
+            <parameter type-id='type-id-1228'/>
+            <parameter type-id='type-id-1231'/>
+            <parameter type-id='type-id-1225'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;bool, std::allocator&lt;bool&gt; &gt;' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='526' column='1' id='type-id-1246'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-643'/>
+      <class-decl name='vector&lt;bool, std::allocator&lt;bool&gt; &gt;' size-in-bits='320' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='526' column='1' id='type-id-1235'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-632'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='539' column='1' id='type-id-2245'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-1188' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='544' column='1' id='type-id-2246'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='544' column='1' id='type-id-2246'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-1192' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='545' column='1' id='type-id-2247'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='545' column='1' id='type-id-2247'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='558' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6011,31 +6011,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='562' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='567' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='571' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-315'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-304'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1248'/>
+            <parameter type-id='type-id-1237'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6049,8 +6049,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <parameter type-id='type-id-1086'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-1075'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6062,8 +6062,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1250'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-812'/>
+      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1239'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-801'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2249' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2248'/>
         </member-type>
@@ -6097,31 +6097,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1986'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1252'/>
+            <parameter type-id='type-id-1241'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6135,8 +6135,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1252'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-1241'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6144,7 +6144,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
             <parameter type-id='type-id-1879'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6152,7 +6152,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1880' is-artificial='yes'/>
             <parameter type-id='type-id-2262'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6164,8 +6164,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1254'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-821'/>
+      <class-decl name='vector&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1243'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-810'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2264' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2263'/>
         </member-type>
@@ -6199,31 +6199,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1989'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1256'/>
+            <parameter type-id='type-id-1245'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6237,8 +6237,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
-            <parameter type-id='type-id-1256'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-1245'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6246,7 +6246,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
             <parameter type-id='type-id-1882'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6254,7 +6254,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1883' is-artificial='yes'/>
             <parameter type-id='type-id-2277'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6266,8 +6266,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1258'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-830'/>
+      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1247'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-819'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-2279' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2278'/>
         </member-type>
@@ -6301,31 +6301,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1992'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1260'/>
+            <parameter type-id='type-id-1249'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6339,8 +6339,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
-            <parameter type-id='type-id-1260'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-1249'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6348,7 +6348,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
             <parameter type-id='type-id-1885'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6356,7 +6356,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1886' is-artificial='yes'/>
             <parameter type-id='type-id-2292'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6368,8 +6368,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1262'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-839'/>
+      <class-decl name='vector&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1251'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-828'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2294' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2293'/>
         </member-type>
@@ -6400,31 +6400,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1268'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1257'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1264'/>
+            <parameter type-id='type-id-1253'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6438,8 +6438,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
-            <parameter type-id='type-id-1264'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-1253'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6447,7 +6447,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
             <parameter type-id='type-id-1888'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6455,7 +6455,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1889' is-artificial='yes'/>
             <parameter type-id='type-id-2307'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6467,8 +6467,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1269'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-848'/>
+      <class-decl name='vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1258'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-837'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2309' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2308'/>
         </member-type>
@@ -6499,31 +6499,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1275'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1264'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1271'/>
+            <parameter type-id='type-id-1260'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6537,8 +6537,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
-            <parameter type-id='type-id-1271'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-1260'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6546,7 +6546,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
             <parameter type-id='type-id-1892'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6554,7 +6554,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1893' is-artificial='yes'/>
             <parameter type-id='type-id-2322'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6566,8 +6566,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1276'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-857'/>
+      <class-decl name='vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1265'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-846'/>
         <member-type access='public'>
           <typedef-decl name='const_iterator' type-id='type-id-126' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2323'/>
         </member-type>
@@ -6598,31 +6598,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1284'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-1273'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
+            <parameter type-id='type-id-1267'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6636,8 +6636,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1267'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6645,15 +6645,15 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
             <parameter type-id='type-id-1896'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1092'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-1081'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6693,19 +6693,19 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorISsSaISsEE4sizeEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE4sizeEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorISsSaISsEE5beginEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE5beginEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
             <return type-id='type-id-2323'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorISsSaISsEE3endEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE3endEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
             <return type-id='type-id-2323'/>
           </function-decl>
         </member-function>
@@ -6734,35 +6734,35 @@
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorISsSaISsEEC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEEC2ERKS0_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorISsSaISsEE12_M_check_lenEmPKc' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE12_M_check_lenEmPKc'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-1280'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorISsSaISsEE8max_sizeEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE8max_sizeEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorISsSaISsEEaSERKS1_' filepath='/usr/include/c++/4.9/bits/vector.tcc' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEEaSERKS1_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
+            <parameter type-id='type-id-1267'/>
             <return type-id='type-id-1895'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorISsSaISsEEixEm' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEEixEm'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-2324'/>
           </function-decl>
         </member-function>
@@ -6774,14 +6774,14 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorISsSaISsEE8capacityEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorISsSaISsEE8capacityEv'>
-            <parameter type-id='type-id-1279' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-1268' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_allocate_and_copy&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsmT_S9_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='1221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISsSaISsEE20_M_allocate_and_copyIN9__gnu_cxx17__normal_iteratorIPKSsS1_EEEEPSsmT_S9_'>
             <parameter type-id='type-id-1897' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-126'/>
             <parameter type-id='type-id-126'/>
             <return type-id='type-id-2327'/>
@@ -6807,8 +6807,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1285'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-866'/>
+      <class-decl name='vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1274'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-855'/>
         <member-type access='public'>
           <typedef-decl name='const_reference' type-id='type-id-2336' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2335'/>
         </member-type>
@@ -6839,31 +6839,31 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-1269'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-1280'/>
-            <parameter type-id='type-id-1291'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1276'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6877,8 +6877,8 @@
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
-            <parameter type-id='type-id-1287'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-1276'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6886,7 +6886,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
             <parameter type-id='type-id-1900'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6894,7 +6894,7 @@
           <function-decl name='vector' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1901' is-artificial='yes'/>
             <parameter type-id='type-id-2349'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -6944,13 +6944,13 @@
         <enumerator name='memory_order_acq_rel' value='4'/>
         <enumerator name='memory_order_seq_cst' value='5'/>
       </enum-decl>
-      <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='300' column='1' id='type-id-628'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <class-decl name='_Bit_const_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='300' column='1' id='type-id-617'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-624'/>
         <member-type access='public'>
-          <typedef-decl name='const_iterator' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='305' column='1' id='type-id-1451'/>
+          <typedef-decl name='const_iterator' type-id='type-id-617' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='305' column='1' id='type-id-1451'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-316' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='304' column='1' id='type-id-2353'/>
+          <typedef-decl name='pointer' type-id='type-id-305' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='304' column='1' id='type-id-2353'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-1' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='302' column='1' id='type-id-2354'/>
@@ -6972,21 +6972,21 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='_Bit_const_iterator' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-633'/>
+            <parameter type-id='type-id-622'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='214' column='1' id='type-id-631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <class-decl name='_Bit_iterator' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='214' column='1' id='type-id-620'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-624'/>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-631' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='218' column='1' id='type-id-1454'/>
+          <typedef-decl name='iterator' type-id='type-id-620' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='218' column='1' id='type-id-1454'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1458' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='217' column='1' id='type-id-2355'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-639' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='216' column='1' id='type-id-2356'/>
+          <typedef-decl name='reference' type-id='type-id-628' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='216' column='1' id='type-id-2356'/>
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Bit_iterator' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7003,7 +7003,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_iterator_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='136' column='1' id='type-id-635'>
+      <class-decl name='_Bit_iterator_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='136' column='1' id='type-id-624'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2357'/>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_p' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='139' column='1'/>
@@ -7020,7 +7020,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bit_reference' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='70' column='1' id='type-id-639'>
+      <class-decl name='_Bit_reference' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='70' column='1' id='type-id-628'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_p' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='72' column='1'/>
         </data-member>
@@ -7042,15 +7042,15 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='411' column='1' id='type-id-643'>
+      <class-decl name='_Bvector_base&lt;std::allocator&lt;bool&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='411' column='1' id='type-id-632'>
         <member-type access='public'>
           <class-decl name='_Bvector_impl' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='416' column='1' id='type-id-1465'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-972'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-961'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='419' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='419' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_finish' type-id='type-id-631' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='420' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-620' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='420' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='256'>
               <var-decl name='_M_end_of_storage' type-id='type-id-1460' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='421' column='1'/>
@@ -7064,7 +7064,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Bvector_impl' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='427' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1466' is-artificial='yes'/>
-                <parameter type-id='type-id-648'/>
+                <parameter type-id='type-id-637'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7078,10 +7078,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Bit_alloc_type' type-id='type-id-2096' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='414' column='1' id='type-id-646'/>
+          <typedef-decl name='_Bit_alloc_type' type-id='type-id-2096' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='414' column='1' id='type-id-635'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-960' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='440' column='1' id='type-id-649'/>
+          <typedef-decl name='allocator_type' type-id='type-id-949' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='440' column='1' id='type-id-638'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_impl' type-id='type-id-1465' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='477' column='1'/>
@@ -7095,7 +7095,7 @@
         <member-function access='public'>
           <function-decl name='_Bvector_base' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1462' is-artificial='yes'/>
-            <parameter type-id='type-id-651'/>
+            <parameter type-id='type-id-640'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7137,9 +7137,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, mongo::BSONObjBuilder*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-668'>
+      <class-decl name='_Head_base&lt;0ul, mongo::BSONObjBuilder*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-657'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1334' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1323' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7150,14 +7150,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1325'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1479' is-artificial='yes'/>
-            <parameter type-id='type-id-670'/>
+            <parameter type-id='type-id-659'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7179,11 +7179,11 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo14BSONObjBuilderELb0EE7_M_headERS3_' filepath='/usr/include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo14BSONObjBuilderELb0EE7_M_headERS3_'>
             <parameter type-id='type-id-1477'/>
-            <return type-id='type-id-1337'/>
+            <return type-id='type-id-1326'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-671'>
+      <class-decl name='_Head_base&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-660'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-2232' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7203,7 +7203,7 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1482' is-artificial='yes'/>
-            <parameter type-id='type-id-673'/>
+            <parameter type-id='type-id-662'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7224,12 +7224,12 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_' filepath='/usr/include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_'>
-            <parameter type-id='type-id-673'/>
+            <parameter type-id='type-id-662'/>
             <return type-id='type-id-2224'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-674'>
+      <class-decl name='_Head_base&lt;0ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-663'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-50' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7242,14 +7242,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1485' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1485' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
+            <parameter type-id='type-id-665'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7269,8 +7269,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-677'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
+      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-666'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
@@ -7280,14 +7280,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1488' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
+            <parameter type-id='type-id-668'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7313,8 +7313,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-680'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1070'/>
+      <class-decl name='_Head_base&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='82' column='1' id='type-id-669'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1059'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
@@ -7324,14 +7324,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1491' is-artificial='yes'/>
-            <parameter type-id='type-id-682'/>
+            <parameter type-id='type-id-671'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7351,7 +7351,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-683'>
+      <class-decl name='_Head_base&lt;1ul, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='129' column='1' id='type-id-672'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-50' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
@@ -7364,14 +7364,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1494' is-artificial='yes'/>
-            <parameter type-id='type-id-685'/>
+            <parameter type-id='type-id-674'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7432,36 +7432,36 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='2496' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-698'>
+      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='2496' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-687'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1666'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-545' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-534' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-702'>
+      <class-decl name='_List_node&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-691'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1666'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-549' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-538' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::Status, mongo::InitializerContext*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/functional' line='499' column='1' id='type-id-2146'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2369'/>
       </class-decl>
-      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-752'>
+      <class-decl name='_Rb_tree_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='242' column='1' id='type-id-741'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-2371' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='254' column='1' id='type-id-2370'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Link_type' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2372'/>
+          <typedef-decl name='_Link_type' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='255' column='1' id='type-id-2372'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-752' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-755'/>
+          <typedef-decl name='_Self' type-id='type-id-741' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='253' column='1' id='type-id-744'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1184' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2373'/>
+          <typedef-decl name='pointer' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='246' column='1' id='type-id-2373'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1183' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2374'/>
+          <typedef-decl name='reference' type-id='type-id-1172' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='245' column='1' id='type-id-2374'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-2370' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='318' column='1'/>
@@ -7482,17 +7482,17 @@
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <parameter type-id='type-id-760'/>
+            <parameter type-id='type-id-749'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-761'>
+      <class-decl name='_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='172' column='1' id='type-id-750'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-1535' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='182' column='1' id='type-id-2375'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-761' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-764'/>
+          <typedef-decl name='_Self' type-id='type-id-750' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='181' column='1' id='type-id-753'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-2375' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='238' column='1'/>
@@ -7512,8 +7512,8 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEneERKS3_' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEneERKS3_'>
-            <parameter type-id='type-id-763' is-artificial='yes'/>
-            <parameter type-id='type-id-766'/>
+            <parameter type-id='type-id-752' is-artificial='yes'/>
+            <parameter type-id='type-id-755'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -7521,12 +7521,12 @@
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Rb_tree_iteratorISt4pairIKSsSsEEppEi'>
             <parameter type-id='type-id-1543' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-764'/>
+            <return type-id='type-id-753'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEptEv' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt17_Rb_tree_iteratorISt4pairIKSsSsEEptEv'>
-            <parameter type-id='type-id-763' is-artificial='yes'/>
+            <parameter type-id='type-id-752' is-artificial='yes'/>
             <return type-id='type-id-2376'/>
           </function-decl>
         </member-function>
@@ -7538,14 +7538,14 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-767'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-756'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-764'/>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='_M_storage' type-id='type-id-108' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='147' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-771'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
+      <class-decl name='_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='132' column='1' id='type-id-760'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-764'/>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='_M_storage' type-id='type-id-110' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='147' column='1'/>
         </data-member>
@@ -7556,12 +7556,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-775'>
+      <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='92' column='1' id='type-id-764'>
         <member-type access='public'>
           <typedef-decl name='_Base_ptr' type-id='type-id-1549' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='94' column='1' id='type-id-1535'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Const_Base_ptr' type-id='type-id-777' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2371'/>
+          <typedef-decl name='_Const_Base_ptr' type-id='type-id-766' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='95' column='1' id='type-id-2371'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_color' type-id='type-id-2351' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='97' column='1'/>
@@ -7576,11 +7576,11 @@
           <var-decl name='_M_right' type-id='type-id-1535' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_tree.h' line='100' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-782'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-800'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-668'/>
+      <class-decl name='_Tuple_impl&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-771'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-789'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-657'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-800' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-785'/>
+          <typedef-decl name='_Inherited' type-id='type-id-789' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-774'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7591,15 +7591,15 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1325'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1556' is-artificial='yes'/>
-            <parameter type-id='type-id-784'/>
+            <parameter type-id='type-id-773'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7613,15 +7613,15 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEE7_M_headERS5_' filepath='/usr/include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEE7_M_headERS5_'>
             <parameter type-id='type-id-1554'/>
-            <return type-id='type-id-1337'/>
+            <return type-id='type-id-1326'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-788'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-803'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-671'/>
+      <class-decl name='_Tuple_impl&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-777'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-792'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-660'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-803' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-791'/>
+          <typedef-decl name='_Inherited' type-id='type-id-792' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-780'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7633,14 +7633,14 @@
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1560' is-artificial='yes'/>
             <parameter type-id='type-id-2224'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1560' is-artificial='yes'/>
-            <parameter type-id='type-id-790'/>
+            <parameter type-id='type-id-779'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7653,16 +7653,16 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_' filepath='/usr/include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_'>
-            <parameter type-id='type-id-790'/>
+            <parameter type-id='type-id-779'/>
             <return type-id='type-id-2224'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-794'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-674'/>
+      <class-decl name='_Tuple_impl&lt;0ul, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-783'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-795'/>
+        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-663'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-806' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-797'/>
+          <typedef-decl name='_Inherited' type-id='type-id-795' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-786'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7673,15 +7673,15 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-796'/>
+            <parameter type-id='type-id-785'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7693,9 +7693,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-800'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-789'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-677'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-666'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
@@ -7705,14 +7705,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
-            <parameter type-id='type-id-1068'/>
+            <parameter type-id='type-id-1057'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1568' is-artificial='yes'/>
-            <parameter type-id='type-id-802'/>
+            <parameter type-id='type-id-791'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7730,9 +7730,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-803'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-792'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-680'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-669'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
@@ -7742,14 +7742,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-1072'/>
+            <parameter type-id='type-id-1061'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-805'/>
+            <parameter type-id='type-id-794'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7761,11 +7761,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-806'>
+      <class-decl name='_Tuple_impl&lt;1ul, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='231' column='1' id='type-id-795'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1576'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-683'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-672'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1576' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-809'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1576' filepath='/usr/include/c++/4.9/tuple' line='237' column='1' id='type-id-798'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7776,14 +7776,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-1298'/>
+            <parameter type-id='type-id-1287'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-808'/>
+            <parameter type-id='type-id-797'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7803,10 +7803,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-812'>
+      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::option_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-801'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1583'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-963'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-952'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2257' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -7825,7 +7825,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1585' is-artificial='yes'/>
-                <parameter type-id='type-id-817'/>
+                <parameter type-id='type-id-806'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7839,10 +7839,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2377' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-815'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2377' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-804'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-963' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-818'/>
+          <typedef-decl name='allocator_type' type-id='type-id-952' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-807'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2378' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2257'/>
@@ -7859,7 +7859,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7874,7 +7874,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7896,7 +7896,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
             <parameter type-id='type-id-1579'/>
-            <parameter type-id='type-id-820'/>
+            <parameter type-id='type-id-809'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7908,10 +7908,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-821'>
+      <class-decl name='_Vector_base&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt;, std::allocator&lt;boost::shared_ptr&lt;boost::program_options::options_description&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-810'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1590'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-966'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2272' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -7930,7 +7930,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1592' is-artificial='yes'/>
-                <parameter type-id='type-id-826'/>
+                <parameter type-id='type-id-815'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -7944,10 +7944,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2379' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-824'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2379' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-813'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-966' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-827'/>
+          <typedef-decl name='allocator_type' type-id='type-id-955' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-816'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2380' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2272'/>
@@ -7964,7 +7964,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -7979,7 +7979,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8001,7 +8001,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1587' is-artificial='yes'/>
             <parameter type-id='type-id-1586'/>
-            <parameter type-id='type-id-829'/>
+            <parameter type-id='type-id-818'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8013,10 +8013,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-830'>
+      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-819'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1597'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-975'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-964'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2287' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8035,7 +8035,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1599' is-artificial='yes'/>
-                <parameter type-id='type-id-835'/>
+                <parameter type-id='type-id-824'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8049,10 +8049,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2381' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-833'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2381' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-822'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-975' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-836'/>
+          <typedef-decl name='allocator_type' type-id='type-id-964' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-825'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2382' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2287'/>
@@ -8069,7 +8069,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8084,7 +8084,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8106,7 +8106,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1594' is-artificial='yes'/>
             <parameter type-id='type-id-1593'/>
-            <parameter type-id='type-id-838'/>
+            <parameter type-id='type-id-827'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8118,10 +8118,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-839'>
+      <class-decl name='_Vector_base&lt;mongo::optionenvironment::Constraint*, std::allocator&lt;mongo::optionenvironment::Constraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-828'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1604'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-978'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-967'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2296' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8140,7 +8140,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1606' is-artificial='yes'/>
-                <parameter type-id='type-id-844'/>
+                <parameter type-id='type-id-833'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8154,10 +8154,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2383' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-842'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2383' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-831'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-978' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-845'/>
+          <typedef-decl name='allocator_type' type-id='type-id-967' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-834'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2384' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2296'/>
@@ -8174,7 +8174,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8189,7 +8189,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8211,7 +8211,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1601' is-artificial='yes'/>
             <parameter type-id='type-id-1600'/>
-            <parameter type-id='type-id-847'/>
+            <parameter type-id='type-id-836'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8223,10 +8223,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-848'>
+      <class-decl name='_Vector_base&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-837'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1611'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-981'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2311' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8245,7 +8245,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1613' is-artificial='yes'/>
-                <parameter type-id='type-id-853'/>
+                <parameter type-id='type-id-842'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8259,10 +8259,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2385' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-851'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2385' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-840'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-981' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-854'/>
+          <typedef-decl name='allocator_type' type-id='type-id-970' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-843'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2386' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2311'/>
@@ -8279,7 +8279,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8294,7 +8294,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8316,7 +8316,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
             <parameter type-id='type-id-1607'/>
-            <parameter type-id='type-id-856'/>
+            <parameter type-id='type-id-845'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8328,10 +8328,10 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-857'>
+      <class-decl name='_Vector_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-846'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1618'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1011'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2328' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8350,7 +8350,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1620' is-artificial='yes'/>
-                <parameter type-id='type-id-862'/>
+                <parameter type-id='type-id-851'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8370,7 +8370,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseISsSaISsEE12_Vector_implC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseISsSaISsEE12_Vector_implC2ERKS0_'>
                 <parameter type-id='type-id-1620' is-artificial='yes'/>
-                <parameter type-id='type-id-862'/>
+                <parameter type-id='type-id-851'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8384,10 +8384,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2387' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-860'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2387' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-849'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1011' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-863'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1000' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-852'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2388' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2328'/>
@@ -8404,7 +8404,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8419,7 +8419,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8441,7 +8441,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
             <parameter type-id='type-id-1614'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8473,8 +8473,8 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseISsSaISsEE19_M_get_Tp_allocatorEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseISsSaISsEE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <return type-id='type-id-862'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <return type-id='type-id-851'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8487,8 +8487,8 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt12_Vector_baseISsSaISsEE13get_allocatorEv' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseISsSaISsEE13get_allocatorEv'>
-            <parameter type-id='type-id-859' is-artificial='yes'/>
-            <return type-id='type-id-863'/>
+            <parameter type-id='type-id-848' is-artificial='yes'/>
+            <return type-id='type-id-852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8501,15 +8501,15 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseISsSaISsEEC2ERKS0_' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseISsSaISsEEC2ERKS0_'>
             <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-865'/>
+            <parameter type-id='type-id-854'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-866'>
+      <class-decl name='_Vector_base&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-855'>
         <member-type access='public'>
           <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1625'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1026'/>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-2338' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
@@ -8528,7 +8528,7 @@
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1627' is-artificial='yes'/>
-                <parameter type-id='type-id-871'/>
+                <parameter type-id='type-id-860'/>
                 <return type-id='type-id-65'/>
               </function-decl>
             </member-function>
@@ -8542,10 +8542,10 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2389' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-869'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2389' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-858'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1026' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-872'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1015' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-861'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2390' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2338'/>
@@ -8562,7 +8562,7 @@
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8577,7 +8577,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8599,7 +8599,7 @@
           <function-decl name='_Vector_base' filepath='/usr/include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1622' is-artificial='yes'/>
             <parameter type-id='type-id-1621'/>
-            <parameter type-id='type-id-874'/>
+            <parameter type-id='type-id-863'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8639,7 +8639,7 @@
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::BSONObjBuilder, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2393'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1333' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2394'/>
+          <typedef-decl name='type' type-id='type-id-1322' filepath='/usr/include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2394'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::optionenvironment::Constraint, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2395'>
@@ -8654,7 +8654,7 @@
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::BSONObjBuilder*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2399'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1337' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2400'/>
+          <typedef-decl name='type' type-id='type-id-1326' filepath='/usr/include/c++/4.9/tuple' line='63' column='1' id='type-id-2400'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/tuple' line='62' column='1' id='type-id-2401'>
@@ -8717,7 +8717,7 @@
           <typedef-decl name='__type' type-id='type-id-2133' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-2424'/>
         </member-type>
       </class-decl>
-      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-875'>
+      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-864'>
         <member-type access='private'>
           <typedef-decl name='__int_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1630'/>
         </member-type>
@@ -8740,7 +8740,7 @@
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-877'/>
+            <parameter type-id='type-id-866'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -8763,8 +8763,8 @@
       <class-decl name='__copy_move&lt;false, false, std::random_access_iterator_tag&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='327' column='1' id='type-id-2426'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;const std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKSsPSsEET0_T_S7_S6_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__copy_moveILb0ELb0ESt26random_access_iterator_tagE8__copy_mIPKSsPSsEET0_T_S7_S6_'>
-            <parameter type-id='type-id-1034'/>
-            <parameter type-id='type-id-1034'/>
+            <parameter type-id='type-id-1023'/>
+            <parameter type-id='type-id-1023'/>
             <parameter type-id='type-id-1750'/>
             <return type-id='type-id-1750'/>
           </function-decl>
@@ -8830,7 +8830,7 @@
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;, std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2440'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-771' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1680'/>
+          <typedef-decl name='__type' type-id='type-id-760' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1680'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2441'>
@@ -8845,17 +8845,17 @@
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2444'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1177' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1684'/>
+          <typedef-decl name='__type' type-id='type-id-1166' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1684'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2445'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1181' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1686'/>
+          <typedef-decl name='__type' type-id='type-id-1170' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1686'/>
         </member-type>
       </class-decl>
       <class-decl name='__ptrtr_not_void&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-2446'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1200' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1688'/>
+          <typedef-decl name='__type' type-id='type-id-1189' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1688'/>
         </member-type>
       </class-decl>
       <class-decl name='__uninitialized_copy&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='64' column='1' id='type-id-2447'>
@@ -8869,8 +8869,8 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSsES3_EET0_T_S6_S5_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPSsES3_EET0_T_S6_S5_'>
-            <parameter type-id='type-id-1166'/>
-            <parameter type-id='type-id-1166'/>
+            <parameter type-id='type-id-1155'/>
+            <parameter type-id='type-id-1155'/>
             <parameter type-id='type-id-1750'/>
             <return type-id='type-id-1750'/>
           </function-decl>
@@ -8972,7 +8972,7 @@
       </class-decl>
       <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2470'>
         <member-type access='private'>
-          <typedef-decl name='__size_type' type-id='type-id-1280' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2471'/>
+          <typedef-decl name='__size_type' type-id='type-id-1269' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-2471'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind_alloc' type-id='type-id-2408' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2472'/>
@@ -9007,7 +9007,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2410' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2484'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1266' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1732'/>
+          <typedef-decl name='value_type' type-id='type-id-1255' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1732'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2486' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2485'/>
@@ -9027,7 +9027,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2412' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2492'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1273' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1734'/>
+          <typedef-decl name='value_type' type-id='type-id-1262' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1734'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2494' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2493'/>
@@ -9089,7 +9089,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2416' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2508'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1282' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1738'/>
+          <typedef-decl name='value_type' type-id='type-id-1271' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1738'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2510' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2509'/>
@@ -9144,13 +9144,13 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaISsEE8max_sizeERKS0_' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISsEE8max_sizeERKS0_'>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <return type-id='type-id-2473'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_max_size&lt;const std::allocator&lt;std::basic_string&lt;char&gt; &gt;, void&gt;' mangled-name='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISsEE11_S_max_sizeIKS0_vEEmRT_i'>
-            <parameter type-id='type-id-1013'/>
+            <parameter type-id='type-id-1002'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-2473'/>
           </function-decl>
@@ -9187,7 +9187,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2420' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2524'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-733' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1740'/>
+          <typedef-decl name='value_type' type-id='type-id-722' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1740'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2526' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2525'/>
@@ -9207,7 +9207,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2422' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2531'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-749' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1742'/>
+          <typedef-decl name='value_type' type-id='type-id-738' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1742'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2533' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2532'/>
@@ -9227,7 +9227,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-2424' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2539'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1289' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1744'/>
+          <typedef-decl name='value_type' type-id='type-id-1278' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-1744'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__const_void_pointer' type-id='type-id-2541' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-2540'/>
@@ -9244,8 +9244,8 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1029'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-875'/>
+      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/atomic' line='617' column='1' id='type-id-1018'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-864'/>
         <member-type access='public'>
           <typedef-decl name='__integral_type' type-id='type-id-50' filepath='/usr/include/c++/4.9/atomic' line='619' column='1' id='type-id-2543'/>
         </member-type>
@@ -9265,7 +9265,7 @@
         <member-function access='public'>
           <function-decl name='atomic' filepath='/usr/include/c++/4.9/atomic' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1747' is-artificial='yes'/>
-            <parameter type-id='type-id-1031'/>
+            <parameter type-id='type-id-1020'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9280,12 +9280,12 @@
       <class-decl name='binary_function&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2544'/>
       <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::BSONObjBuilder&gt;, const std::default_delete&lt;mongo::BSONObjBuilder&gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2545'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1068' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2229'/>
+          <typedef-decl name='type' type-id='type-id-1057' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2229'/>
         </member-type>
       </class-decl>
       <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1967' column='1' id='type-id-2546'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1072' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2235'/>
+          <typedef-decl name='type' type-id='type-id-1061' filepath='/usr/include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2235'/>
         </member-type>
       </class-decl>
       <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1962' column='1' id='type-id-2547'>
@@ -9293,7 +9293,7 @@
           <typedef-decl name='type' type-id='type-id-2549' filepath='/usr/include/c++/4.9/type_traits' line='1963' column='1' id='type-id-2548'/>
         </member-type>
       </class-decl>
-      <class-decl name='default_delete&lt;mongo::BSONObjBuilder&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1066'>
+      <class-decl name='default_delete&lt;mongo::BSONObjBuilder&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1055'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1767' is-artificial='yes'/>
@@ -9302,13 +9302,13 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14default_deleteIN5mongo14BSONObjBuilderEEclEPS1_'>
-            <parameter type-id='type-id-1069' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1058' is-artificial='yes'/>
+            <parameter type-id='type-id-1323'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1070'>
+      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1059'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1769' is-artificial='yes'/>
@@ -9316,59 +9316,59 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1074'>
+      <class-decl name='equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1063'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2544'/>
       </class-decl>
-      <class-decl name='hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1082'>
+      <class-decl name='hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1071'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2428'/>
       </class-decl>
-      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1098'>
+      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1087'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2550'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZNSt17integral_constantIbLb0EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1101'>
+      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1090'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZNSt17integral_constantIbLb1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1104'>
+      <class-decl name='integral_constant&lt;long int, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1093'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1107'>
+      <class-decl name='integral_constant&lt;long int, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1096'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1110'>
+      <class-decl name='integral_constant&lt;long int, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1099'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1000EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long int, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1113'>
+      <class-decl name='integral_constant&lt;long int, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1102'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-27' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2551'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-343' mangled-name='_ZNSt17integral_constantIlLl1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-332' mangled-name='_ZNSt17integral_constantIlLl1EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long unsigned int, 2ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1116'>
+      <class-decl name='integral_constant&lt;long unsigned int, 2ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1105'>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/type_traits' line='72' column='1' id='type-id-2552'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZNSt17integral_constantImLm2EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZNSt17integral_constantImLm2EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1119'>
+      <class-decl name='integral_constant&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='69' column='1' id='type-id-1108'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZNSt17integral_constantImLm8EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZNSt17integral_constantImLm8EE5valueE' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='iterator&lt;std::random_access_iterator_tag, bool, long int, bool const*, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='118' column='1' id='type-id-2205'/>
@@ -9383,7 +9383,7 @@
           <typedef-decl name='pointer' type-id='type-id-59' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2554'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-333' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2555'/>
+          <typedef-decl name='reference' type-id='type-id-322' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2555'/>
         </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;char*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2556'>
@@ -9393,10 +9393,10 @@
           <typedef-decl name='difference_type' type-id='type-id-2559' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-2558'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2560'/>
+          <typedef-decl name='pointer' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-2560'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1033' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2561'/>
+          <typedef-decl name='reference' type-id='type-id-1022' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-2561'/>
         </member-type>
       </class-decl>
       <class-decl name='iterator_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-2562'>
@@ -9407,10 +9407,10 @@
           <typedef-decl name='reference' type-id='type-id-1748' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-2563'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-1282'/>
+          <typedef-decl name='value_type' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-1271'/>
         </member-type>
       </class-decl>
-      <class-decl name='less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='367' column='1' id='type-id-1122'>
+      <class-decl name='less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='367' column='1' id='type-id-1111'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2544'/>
       </class-decl>
       <class-decl name='make_unsigned&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1666' column='1' id='type-id-2564'>
@@ -9419,7 +9419,7 @@
         </member-type>
       </class-decl>
       <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/new' line='99' column='1' id='type-id-2094'/>
-      <class-decl name='pair&lt;bool, long unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1170'>
+      <class-decl name='pair&lt;bool, long unsigned int&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1159'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-1' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
@@ -9435,15 +9435,15 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1810' is-artificial='yes'/>
-            <parameter type-id='type-id-315'/>
-            <parameter type-id='type-id-1300'/>
+            <parameter type-id='type-id-304'/>
+            <parameter type-id='type-id-1289'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1810' is-artificial='yes'/>
-            <parameter type-id='type-id-1172'/>
+            <parameter type-id='type-id-1161'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9455,9 +9455,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1173'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1162'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-1403' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
@@ -9471,7 +9471,7 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1813' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
             <parameter type-id='type-id-1405'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -9479,7 +9479,7 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1813' is-artificial='yes'/>
-            <parameter type-id='type-id-1175'/>
+            <parameter type-id='type-id-1164'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9491,12 +9491,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1177'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1166'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-553' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-542' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9507,15 +9507,15 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1816' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-555'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-544'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1816' is-artificial='yes'/>
-            <parameter type-id='type-id-1179'/>
+            <parameter type-id='type-id-1168'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9527,12 +9527,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1181'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1170'>
         <member-type access='public'>
-          <typedef-decl name='first_type' type-id='type-id-1032' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2566'/>
+          <typedef-decl name='first_type' type-id='type-id-1021' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='98' column='1' id='type-id-2566'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-1032' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-1021' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='second' type-id='type-id-31' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
@@ -9546,15 +9546,15 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1819' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-1022'/>
+            <parameter type-id='type-id-1022'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1819' is-artificial='yes'/>
-            <parameter type-id='type-id-1183'/>
+            <parameter type-id='type-id-1172'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9566,7 +9566,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1185'>
+      <class-decl name='pair&lt;std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1174'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-1549' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
@@ -9590,7 +9590,7 @@
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-1187'/>
+            <parameter type-id='type-id-1176'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -9668,7 +9668,7 @@
       </class-decl>
       <class-decl name='pointer_traits&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2585'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-774' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2586'/>
+          <typedef-decl name='rebind' type-id='type-id-763' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2586'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2587'/>
@@ -9679,7 +9679,7 @@
       </class-decl>
       <class-decl name='pointer_traits&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2588'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2589'/>
+          <typedef-decl name='rebind' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2589'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2590'/>
@@ -9704,7 +9704,7 @@
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2595'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1180' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2596'/>
+          <typedef-decl name='rebind' type-id='type-id-1169' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2596'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2597'/>
@@ -9715,7 +9715,7 @@
       </class-decl>
       <class-decl name='pointer_traits&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2598'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1184' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2599'/>
+          <typedef-decl name='rebind' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2599'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2600'/>
@@ -9726,7 +9726,7 @@
       </class-decl>
       <class-decl name='pointer_traits&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-2601'>
         <member-type access='public'>
-          <typedef-decl name='rebind' type-id='type-id-1203' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2602'/>
+          <typedef-decl name='rebind' type-id='type-id-1192' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2602'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='rebind' type-id='type-id-45' filepath='/usr/include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-2603'/>
@@ -9737,70 +9737,70 @@
       </class-decl>
       <class-decl name='ratio&lt;1000000000l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2604'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000000000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1000l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2605'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1000ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2606'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2607'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1000l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2608'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1000EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='ratio&lt;1l, 1l&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='263' column='1' id='type-id-2609'>
         <data-member access='public' static='yes'>
-          <var-decl name='num' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
+          <var-decl name='num' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1EE3numE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='270' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='den' type-id='type-id-342' mangled-name='_ZNSt5ratioILl1ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
+          <var-decl name='den' type-id='type-id-331' mangled-name='_ZNSt5ratioILl1ELl1EE3denE' visibility='default' filepath='/usr/include/c++/4.9/ratio' line='273' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='remove_reference&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2610'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1032' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1823'/>
+          <typedef-decl name='type' type-id='type-id-1021' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1823'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::InitializerContext*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2611'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1363' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1825'/>
+          <typedef-decl name='type' type-id='type-id-1352' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1825'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::Status (*&amp;)(mongo::InitializerContext*)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2612'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-212' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1827'/>
+          <typedef-decl name='type' type-id='type-id-1373' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1827'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2613'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1011' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1829'/>
+          <typedef-decl name='type' type-id='type-id-1000' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1829'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2614'>
@@ -9817,17 +9817,17 @@
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2617'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1066' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1836'/>
+          <typedef-decl name='type' type-id='type-id-1055' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1836'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1500' column='1' id='type-id-2618'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1070' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1838'/>
+          <typedef-decl name='type' type-id='type-id-1059' filepath='/usr/include/c++/4.9/type_traits' line='1501' column='1' id='type-id-1838'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/type_traits' line='1504' column='1' id='type-id-2619'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1276' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1840'/>
+          <typedef-decl name='type' type-id='type-id-1265' filepath='/usr/include/c++/4.9/type_traits' line='1505' column='1' id='type-id-1840'/>
         </member-type>
       </class-decl>
       <class-decl name='tuple_element&lt;1ul, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/utility' line='97' column='1' id='type-id-2620'>
@@ -9837,14 +9837,14 @@
       </class-decl>
       <class-decl name='unary_function&lt;mongo::InitializerContext*, mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2369'/>
       <typedef-decl name='_Bit_type' type-id='type-id-82' filepath='/usr/include/c++/4.9/bits/stl_bvector.h' line='67' column='1' id='type-id-1459'/>
-      <typedef-decl name='__umap_hashtable' type-id='type-id-655' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='52' column='1' id='type-id-2238'/>
-      <typedef-decl name='false_type' type-id='type-id-1098' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2622'/>
+      <typedef-decl name='__umap_hashtable' type-id='type-id-644' filepath='/usr/include/c++/4.9/bits/unordered_map.h' line='52' column='1' id='type-id-2238'/>
+      <typedef-decl name='false_type' type-id='type-id-1087' filepath='/usr/include/c++/4.9/type_traits' line='90' column='1' id='type-id-2622'/>
       <typedef-decl name='memory_order' type-id='type-id-2352' filepath='/usr/include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-2425'/>
       <typedef-decl name='ptrdiff_t' type-id='type-id-27' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-2559'/>
       <typedef-decl name='size_t' type-id='type-id-82' filepath='/usr/include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-46'/>
-      <typedef-decl name='string' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-1204'/>
-      <typedef-decl name='true_type' type-id='type-id-1101' filepath='/usr/include/c++/4.9/type_traits' line='87' column='1' id='type-id-2018'/>
-      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1764' column='1' id='type-id-623'>
+      <typedef-decl name='string' type-id='type-id-31' filepath='/usr/include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-1193'/>
+      <typedef-decl name='true_type' type-id='type-id-1090' filepath='/usr/include/c++/4.9/type_traits' line='87' column='1' id='type-id-2018'/>
+      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1764' column='1' id='type-id-612'>
         <data-member access='public'>
           <var-decl name='_M_unused' type-id='type-id-2623' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1779' column='1'/>
         </data-member>
@@ -9859,7 +9859,7 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/usr/include/c++/4.9/functional' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
-            <parameter type-id='type-id-627' name='this' is-artificial='yes'/>
+            <parameter type-id='type-id-616' name='this' is-artificial='yes'/>
             <return type-id='type-id-45'/>
           </function-decl>
         </member-function>
@@ -9872,19 +9872,19 @@
         <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (**)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1449' name='this' is-artificial='yes'/>
-            <return type-id='type-id-219'/>
+            <return type-id='type-id-1380'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v' filepath='/usr/include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERKT_v'>
-            <parameter type-id='type-id-627' name='this' is-artificial='yes'/>
-            <return type-id='type-id-214'/>
+            <parameter type-id='type-id-616' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1375'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;mongo::Status (*)(mongo::InitializerContext*)&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v' filepath='/usr/include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPFN5mongo6StatusEPNS1_18InitializerContextEEEERT_v'>
             <parameter type-id='type-id-1449' name='this' is-artificial='yes'/>
-            <return type-id='type-id-216'/>
+            <return type-id='type-id-1377'/>
           </function-decl>
         </member-function>
       </union-decl>
@@ -9896,7 +9896,7 @@
           <var-decl name='_M_const_object' type-id='type-id-45' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_M_function_pointer' type-id='type-id-1914' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760' column='1'/>
+          <var-decl name='_M_function_pointer' type-id='type-id-1915' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1760' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='_M_member_pointer' type-id='type-id-61' visibility='default' filepath='/usr/include/c++/4.9/functional' line='1761' column='1'/>
@@ -10000,13 +10000,13 @@
       <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2650'/>
       <function-decl name='__do_alloc_on_copy&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt18__do_alloc_on_copyISaISsEEvRT_RKS1_St17integral_constantIbLb0EE' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18__do_alloc_on_copyISaISsEEvRT_RKS1_St17integral_constantIbLb0EE'>
         <parameter type-id='type-id-1721'/>
-        <parameter type-id='type-id-1013'/>
+        <parameter type-id='type-id-1002'/>
         <parameter type-id='type-id-2622'/>
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='__alloc_on_copy&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt15__alloc_on_copyISaISsEEvRT_RKS1_' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15__alloc_on_copyISaISsEEvRT_RKS1_'>
         <parameter type-id='type-id-1721' name='__one' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
-        <parameter type-id='type-id-1013' name='__two' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
+        <parameter type-id='type-id-1002' name='__two' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='448' column='1'/>
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='__do_alloc_on_move&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZSt18__do_alloc_on_moveISaISsEEvRT_S2_St17integral_constantIbLb1EE' filepath='/usr/include/c++/4.9/bits/alloc_traits.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18__do_alloc_on_moveISaISsEEvRT_S2_St17integral_constantIbLb1EE'>
@@ -10021,17 +10021,17 @@
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZStneISsEbRKSaIT_ES3_' filepath='/usr/include/c++/4.9/bits/allocator.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneISsEbRKSaIT_ES3_'>
-        <parameter type-id='type-id-1013'/>
-        <parameter type-id='type-id-1013'/>
+        <parameter type-id='type-id-1002'/>
+        <parameter type-id='type-id-1002'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator+&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_OS6_'>
-        <parameter type-id='type-id-1033' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1'/>
+        <parameter type-id='type-id-1022' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2455' column='1'/>
         <parameter type-id='type-id-1749' name='__rhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2456' column='1'/>
         <return type-id='type-id-31'/>
       </function-decl>
       <function-decl name='operator==&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' mangled-name='_ZSteqIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIcSt11char_traitsIcESaIcEEbRKSbIT_T0_T1_EPKS3_'>
-        <parameter type-id='type-id-1033' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
+        <parameter type-id='type-id-1022' name='__lhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2538' column='1'/>
         <parameter type-id='type-id-59' name='__rhs' filepath='/usr/include/c++/4.9/bits/basic_string.h' line='2539' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
@@ -10041,8 +10041,8 @@
         <return type-id='type-id-2350'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::Status (* const)(mongo::InitializerContext*)&gt;' mangled-name='_ZSt11__addressofIKPFN5mongo6StatusEPNS0_18InitializerContextEEEPT_RS7_' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIKPFN5mongo6StatusEPNS0_18InitializerContextEEEPT_RS7_'>
-        <parameter type-id='type-id-214' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-215'/>
+        <parameter type-id='type-id-1375' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1376'/>
       </function-decl>
       <function-decl name='__addressof&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZSt11__addressofISsEPT_RS0_' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofISsEPT_RS0_'>
         <parameter type-id='type-id-1748' name='__r' filepath='/usr/include/c++/4.9/bits/move.h' line='47' column='1'/>
@@ -10054,11 +10054,11 @@
       </function-decl>
       <function-decl name='forward&lt;const std::basic_string&lt;char&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRKSsEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSsEOT_RNSt16remove_referenceIS2_E4typeE'>
         <parameter type-id='type-id-1824' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1033'/>
+        <return type-id='type-id-1022'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::InitializerContext*&gt;' mangled-name='_ZSt7forwardIPN5mongo18InitializerContextEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo18InitializerContextEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-1826' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1364'/>
+        <return type-id='type-id-1353'/>
       </function-decl>
       <function-decl name='forward&lt;std::basic_string&lt;char&gt;&amp;&gt;' mangled-name='_ZSt7forwardIRSsEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSsEOT_RNSt16remove_referenceIS1_E4typeE'>
         <parameter type-id='type-id-1832' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -10069,7 +10069,7 @@
         <return type-id='type-id-1749'/>
       </function-decl>
       <function-decl name='move&lt;mongo::Status (*&amp;)(mongo::InitializerContext*)&gt;' mangled-name='_ZSt4moveIRPFN5mongo6StatusEPNS0_18InitializerContextEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFN5mongo6StatusEPNS0_18InitializerContextEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-216' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1377' name='__t' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-1828'/>
       </function-decl>
       <function-decl name='move&lt;std::allocator&lt;std::basic_string&lt;char&gt; &gt;&amp;&gt;' mangled-name='_ZSt4moveIRSaISsEEONSt16remove_referenceIT_E4typeEOS3_' filepath='/usr/include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSaISsEEONSt16remove_referenceIT_E4typeEOS3_'>
@@ -10094,35 +10094,35 @@
         <return type-id='type-id-65'/>
       </function-decl>
       <namespace-decl name='__detail'>
-        <class-decl name='_Default_ranged_hash' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='457' column='1' id='type-id-879'/>
-        <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-882'>
+        <class-decl name='_Default_ranged_hash' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='457' column='1' id='type-id-868'/>
+        <class-decl name='_Equality&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-871'>
         </class-decl>
-        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-888'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-911'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-920'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-923'/>
+        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-877'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-900'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-909'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-912'/>
           <member-type access='protected'>
             <typedef-decl name='__hash_code' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-2651'/>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='__node_type' type-id='type-id-894' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-891'/>
+            <typedef-decl name='__node_type' type-id='type-id-883' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-880'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='hasher' type-id='type-id-1082' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2239'/>
+            <typedef-decl name='hasher' type-id='type-id-1071' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2239'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='_Hash_code_base' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1254' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1633' is-artificial='yes'/>
-              <parameter type-id='type-id-951'/>
-              <parameter type-id='type-id-1084'/>
               <parameter type-id='type-id-940'/>
-              <parameter type-id='type-id-881'/>
+              <parameter type-id='type-id-1073'/>
+              <parameter type-id='type-id-929'/>
+              <parameter type-id='type-id-870'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-894'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-898'/>
+        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-883'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-887'/>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='_M_hash_code' type-id='type-id-46' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='282' column='1'/>
           </data-member>
@@ -10145,19 +10145,19 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-898'>
+        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-887'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1637'/>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='_M_storage' type-id='type-id-106' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='249' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-901'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-914'/>
+        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-890'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-903'/>
           <member-type access='public'>
             <typedef-decl name='__bucket_type' type-id='type-id-1646' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-1642'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_alloc_type' type-id='type-id-1008' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-905'/>
+            <typedef-decl name='__node_alloc_type' type-id='type-id-997' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-894'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='__node_base' type-id='type-id-1637' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-1645'/>
@@ -10168,7 +10168,7 @@
           <member-function access='public'>
             <function-decl name='_Hashtable_alloc' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1910' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1641' is-artificial='yes'/>
-              <parameter type-id='type-id-903'/>
+              <parameter type-id='type-id-892'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10180,17 +10180,17 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-908'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-888'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-917'/>
+        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-897'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-877'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-906'/>
           <member-type access='public'>
             <typedef-decl name='__hash_code' type-id='type-id-2651' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2023'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_type' type-id='type-id-891' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1651'/>
+            <typedef-decl name='__node_type' type-id='type-id-880' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1651'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='value_type' type-id='type-id-1173' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2652'/>
+            <typedef-decl name='value_type' type-id='type-id-1162' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-2652'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='__ireturn_type' type-id='type-id-2548' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1691' column='1' id='type-id-2653'/>
@@ -10210,17 +10210,17 @@
           <member-function access='protected'>
             <function-decl name='_Hashtable_base' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='1698' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1650' is-artificial='yes'/>
-              <parameter type-id='type-id-951'/>
-              <parameter type-id='type-id-1084'/>
               <parameter type-id='type-id-940'/>
-              <parameter type-id='type-id-881'/>
-              <parameter type-id='type-id-1076'/>
+              <parameter type-id='type-id-1073'/>
+              <parameter type-id='type-id-929'/>
+              <parameter type-id='type-id-870'/>
+              <parameter type-id='type-id-1065'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-911'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-949'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-900'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-938'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1654' is-artificial='yes'/>
@@ -10228,8 +10228,8 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-914'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1008'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-903'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-997'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1656' is-artificial='yes'/>
@@ -10237,8 +10237,8 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-917'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1074'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-906'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1063'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1658' is-artificial='yes'/>
@@ -10246,8 +10246,8 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-920'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1082'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-909'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1071'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1660' is-artificial='yes'/>
@@ -10255,8 +10255,8 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-923'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-938'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-912'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-927'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1662' is-artificial='yes'/>
@@ -10269,10 +10269,10 @@
         </class-decl>
         <class-decl name='_Insert_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1663'>
           <member-type access='protected'>
-            <typedef-decl name='__hashtable' type-id='type-id-655' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-885'/>
+            <typedef-decl name='__hashtable' type-id='type-id-644' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='690' column='1' id='type-id-874'/>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='value_type' type-id='type-id-2652' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-926'/>
+            <typedef-decl name='value_type' type-id='type-id-2652' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-915'/>
           </member-type>
           <member-type access='protected'>
             <typedef-decl name='__ireturn_type' type-id='type-id-2653' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-2658'/>
@@ -10292,15 +10292,15 @@
             <var-decl name='_M_prev' type-id='type-id-1668' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_list.h' line='80' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-929'>
+        <class-decl name='_Map_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-918'>
           <member-type access='public'>
-            <typedef-decl name='key_type' type-id='type-id-746' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-932'/>
+            <typedef-decl name='key_type' type-id='type-id-735' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-921'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='mapped_type' type-id='type-id-2621' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-935'/>
+            <typedef-decl name='mapped_type' type-id='type-id-2621' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-924'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-938'>
+        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-927'>
           <member-type access='public'>
             <typedef-decl name='first_argument_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-2661'/>
           </member-type>
@@ -10311,12 +10311,12 @@
             <typedef-decl name='second_argument_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-2663'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-942'>
+        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-931'>
           <member-type access='public'>
             <typedef-decl name='_State' type-id='type-id-46' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2024'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_growth_factor' type-id='type-id-622' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
+            <var-decl name='_S_growth_factor' type-id='type-id-611' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='_M_max_load_factor' type-id='type-id-22' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='505' column='1'/>
@@ -10332,17 +10332,17 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-946'/>
-        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-949'/>
+        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-935'/>
+        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-938'/>
         <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2655'/>
         <class-decl name='_Local_iterator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, std::__detail::_Select1st, std::hash&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2657'/>
         <class-decl name='_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2654'/>
         <class-decl name='_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2656'/>
       </namespace-decl>
       <function-decl name='max&lt;long unsigned int&gt;' mangled-name='_ZSt3maxImERKT_S2_S2_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3maxImERKT_S2_S2_'>
-        <parameter type-id='type-id-1300' name='__a' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
-        <parameter type-id='type-id-1300' name='__b' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
-        <return type-id='type-id-1300'/>
+        <parameter type-id='type-id-1289' name='__a' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
+        <parameter type-id='type-id-1289' name='__b' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='217' column='1'/>
+        <return type-id='type-id-1289'/>
       </function-decl>
       <function-decl name='__niter_base&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__niter_baseIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEENSt11_Niter_baseIT_E13iterator_typeES9_'>
         <parameter type-id='type-id-126' name='__it' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='278' column='1'/>
@@ -10365,8 +10365,8 @@
         <return type-id='type-id-2204'/>
       </function-decl>
       <function-decl name='__copy_move_a&lt;false, const std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt13__copy_move_aILb0EPKSsPSsET1_T0_S4_S3_' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__copy_move_aILb0EPKSsPSsET1_T0_S4_S3_'>
-        <parameter type-id='type-id-1034' name='__first' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
-        <parameter type-id='type-id-1034' name='__last' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
+        <parameter type-id='type-id-1023' name='__first' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
+        <parameter type-id='type-id-1023' name='__last' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_algobase.h' line='385' column='1'/>
         <return type-id='type-id-1750'/>
       </function-decl>
@@ -10454,18 +10454,18 @@
         <return type-id='type-id-65'/>
       </function-decl>
       <function-decl name='operator==&lt;std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSteqIPSsEbRKSt13move_iteratorIT_ES5_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIPSsEbRKSt13move_iteratorIT_ES5_'>
-        <parameter type-id='type-id-1168' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
-        <parameter type-id='type-id-1168' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
+        <parameter type-id='type-id-1157' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
+        <parameter type-id='type-id-1157' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZStneIPSsEbRKSt13move_iteratorIT_ES5_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIPSsEbRKSt13move_iteratorIT_ES5_'>
-        <parameter type-id='type-id-1168' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
-        <parameter type-id='type-id-1168' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
+        <parameter type-id='type-id-1157' name='__x' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
+        <parameter type-id='type-id-1157' name='__y' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;std::basic_string&lt;char&gt;*, std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPSsSt13move_iteratorIS0_EET0_T_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPSsSt13move_iteratorIS0_EET0_T_'>
         <parameter type-id='type-id-1750' name='__i' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
-        <return type-id='type-id-1166'/>
+        <return type-id='type-id-1155'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;__gnu_cxx::__normal_iterator&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt18uninitialized_copyIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEPSsET0_T_SA_S9_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyIN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEEPSsET0_T_SA_S9_'>
         <parameter type-id='type-id-126' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
@@ -10480,8 +10480,8 @@
         <return type-id='type-id-1750'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*&gt;' mangled-name='_ZSt18uninitialized_copyISt13move_iteratorIPSsES1_ET0_T_S4_S3_' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyISt13move_iteratorIPSsES1_ET0_T_S4_S3_'>
-        <parameter type-id='type-id-1166' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-1166' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-1155' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-1155' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
         <return type-id='type-id-1750'/>
       </function-decl>
@@ -10500,8 +10500,8 @@
         <return type-id='type-id-1750'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;std::move_iterator&lt;std::basic_string&lt;char&gt;*&gt;, std::basic_string&lt;char&gt;*, std::basic_string&lt;char&gt; &gt;' mangled-name='_ZSt22__uninitialized_copy_aISt13move_iteratorIPSsES1_SsET0_T_S4_S3_RSaIT1_E' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__uninitialized_copy_aISt13move_iteratorIPSsES1_SsET0_T_S4_S3_RSaIT1_E'>
-        <parameter type-id='type-id-1166' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-1166' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-1155' name='__first' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-1155' name='__last' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
         <parameter type-id='type-id-1750' name='__result' filepath='/usr/include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
         <parameter type-id='type-id-1721'/>
         <return type-id='type-id-1750'/>
@@ -10514,12 +10514,12 @@
         <return type-id='type-id-1750'/>
       </function-decl>
       <namespace-decl name='chrono'>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1045'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1034'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-27' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1049'/>
+            <typedef-decl name='rep' type-id='type-id-27' filepath='/usr/include/c++/4.9/chrono' line='243' column='1' id='type-id-1038'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10530,7 +10530,7 @@
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1759' is-artificial='yes'/>
-              <parameter type-id='type-id-1047'/>
+              <parameter type-id='type-id-1036'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10542,9 +10542,9 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1052'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1000l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1041'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10555,7 +10555,7 @@
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1761' is-artificial='yes'/>
-              <parameter type-id='type-id-1054'/>
+              <parameter type-id='type-id-1043'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10567,9 +10567,9 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1056'>
+        <class-decl name='duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='241' column='1' id='type-id-1045'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1049' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1038' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10580,7 +10580,7 @@
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1763' is-artificial='yes'/>
-              <parameter type-id='type-id-1058'/>
+              <parameter type-id='type-id-1047'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -10592,12 +10592,12 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1060'>
+        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000000l&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='546' column='1' id='type-id-1049'>
           <member-type access='public'>
-            <typedef-decl name='duration' type-id='type-id-1045' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1063'/>
+            <typedef-decl name='duration' type-id='type-id-1034' filepath='/usr/include/c++/4.9/chrono' line='549' column='1' id='type-id-1052'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__d' type-id='type-id-1063' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='596' column='1'/>
+            <var-decl name='__d' type-id='type-id-1052' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='596' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/include/c++/4.9/chrono' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10608,20 +10608,20 @@
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/include/c++/4.9/chrono' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1765' is-artificial='yes'/>
-              <parameter type-id='type-id-1065'/>
+              <parameter type-id='type-id-1054'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='milliseconds' type-id='type-id-1052' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2664'/>
-        <typedef-decl name='seconds' type-id='type-id-1056' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2665'/>
+        <typedef-decl name='milliseconds' type-id='type-id-1041' filepath='/usr/include/c++/4.9/chrono' line='533' column='1' id='type-id-2664'/>
+        <typedef-decl name='seconds' type-id='type-id-1045' filepath='/usr/include/c++/4.9/chrono' line='536' column='1' id='type-id-2665'/>
         <namespace-decl name='_V2'>
           <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='716' column='1' id='type-id-2666'>
             <member-type access='public'>
-              <typedef-decl name='time_point' type-id='type-id-1060' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1042'/>
+              <typedef-decl name='time_point' type-id='type-id-1049' filepath='/usr/include/c++/4.9/chrono' line='721' column='1' id='type-id-1031'/>
             </member-type>
             <data-member access='public' static='yes'>
-              <var-decl name='is_steady' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='727' column='1'/>
+              <var-decl name='is_steady' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/chrono' line='727' column='1'/>
             </data-member>
           </class-decl>
         </namespace-decl>
@@ -10637,7 +10637,7 @@
         <return type-id='type-id-2402'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0ul, std::basic_ostringstream&lt;char&gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEISt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EIS9_DpT1_EE' filepath='/usr/include/c++/4.9/tuple' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEISt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EIS9_DpT1_EE'>
-        <parameter type-id='type-id-790' name='__t' filepath='/usr/include/c++/4.9/tuple' line='750' column='1'/>
+        <parameter type-id='type-id-779' name='__t' filepath='/usr/include/c++/4.9/tuple' line='750' column='1'/>
         <return type-id='type-id-2392'/>
       </function-decl>
       <function-decl name='get&lt;0ul, mongo::BSONObjBuilder*, std::default_delete&lt;mongo::BSONObjBuilder&gt; &gt;' mangled-name='_ZSt3getILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_' filepath='/usr/include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIPN5mongo14BSONObjBuilderESt14default_deleteIS1_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERSA_'>
@@ -10649,7 +10649,7 @@
         <return type-id='type-id-2402'/>
       </function-decl>
       <function-decl name='get&lt;0ul, std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;*, std::default_delete&lt;std::basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' mangled-name='_ZSt3getILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERKSD_' filepath='/usr/include/c++/4.9/tuple' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EIPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIIDpT0_EEE4typeEE4typeERKSD_'>
-        <parameter type-id='type-id-1212' name='__t' filepath='/usr/include/c++/4.9/tuple' line='766' column='1'/>
+        <parameter type-id='type-id-1201' name='__t' filepath='/usr/include/c++/4.9/tuple' line='766' column='1'/>
         <return type-id='type-id-2392'/>
       </function-decl>
     </namespace-decl>
@@ -10704,7 +10704,7 @@
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-122' is-artificial='yes'/>
-            <parameter type-id='type-id-335'/>
+            <parameter type-id='type-id-324'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10735,7 +10735,7 @@
           <typedef-decl name='difference_type' type-id='type-id-2558' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-2697'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_type' type-id='type-id-1034' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2365'/>
+          <typedef-decl name='iterator_type' type-id='type-id-1023' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='717' column='1' id='type-id-2365'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2560' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-2698'/>
@@ -10744,7 +10744,7 @@
           <typedef-decl name='reference' type-id='type-id-2561' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-2699'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1034' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1023' visibility='default' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10755,14 +10755,14 @@
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-128' is-artificial='yes'/>
-            <parameter type-id='type-id-1036'/>
+            <parameter type-id='type-id-1025'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEC2ERKS2_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEC2ERKS2_'>
             <parameter type-id='type-id-128' is-artificial='yes'/>
-            <parameter type-id='type-id-1036'/>
+            <parameter type-id='type-id-1025'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10774,14 +10774,14 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEEdeEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-229' is-artificial='yes'/>
             <return type-id='type-id-2699'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKSsSt6vectorISsSaISsEEE4baseEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
-            <return type-id='type-id-1036'/>
+            <parameter type-id='type-id-229' is-artificial='yes'/>
+            <return type-id='type-id-1025'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10826,13 +10826,13 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEdeEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEEdeEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
             <return type-id='type-id-2701'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEE4baseEv' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPSsSt6vectorISsSaISsEEE4baseEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
             <return type-id='type-id-1752'/>
           </function-decl>
         </member-function>
@@ -10842,7 +10842,7 @@
           <typedef-decl name='const_pointer' type-id='type-id-59' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2702'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-333' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2138'/>
+          <typedef-decl name='const_reference' type-id='type-id-322' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2138'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-39' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2696'/>
@@ -10851,7 +10851,7 @@
           <typedef-decl name='reference' type-id='type-id-203' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2141'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-1280'/>
+          <typedef-decl name='size_type' type-id='type-id-46' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-1269'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10862,7 +10862,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-139' is-artificial='yes'/>
-            <parameter type-id='type-id-254'/>
+            <parameter type-id='type-id-243'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -10980,7 +10980,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-227' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2294'/>
+          <typedef-decl name='const_reference' type-id='type-id-216' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2294'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2483' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2384'/>
@@ -11002,7 +11002,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-229' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2309'/>
+          <typedef-decl name='const_reference' type-id='type-id-218' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2309'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2491' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2386'/>
@@ -11031,7 +11031,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-231' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2325'/>
+          <typedef-decl name='const_reference' type-id='type-id-220' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2325'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2506' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2388'/>
@@ -11093,7 +11093,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-233' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2336'/>
+          <typedef-decl name='const_reference' type-id='type-id-222' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2336'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-2538' filepath='/usr/include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2390'/>
@@ -11107,122 +11107,122 @@
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2724'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIdE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;float&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2725'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIfE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_floating&lt;long double&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='100' column='1' id='type-id-2726'>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
+          <var-decl name='__max_digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='103' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='106' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits10' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
+          <var-decl name='__digits10' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='107' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max_exponent10' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
+          <var-decl name='__max_exponent10' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx25__numeric_traits_floatingIeE16__max_exponent10E' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='108' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2727'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-332' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-321' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIcE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-321' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIcE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2728'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIiE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;long int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2729'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-343' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-343' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-332' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIlE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2730'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-1299' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-1288' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-1299' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-1288' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerImE8__digitsE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='__numeric_traits_integer&lt;short int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='55' column='1' id='type-id-2731'>
         <data-member access='public' static='yes'>
-          <var-decl name='__min' type-id='type-id-620' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
+          <var-decl name='__min' type-id='type-id-609' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__minE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='58' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__max' type-id='type-id-620' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
+          <var-decl name='__max' type-id='type-id-609' mangled-name='_ZN9__gnu_cxx24__numeric_traits_integerIsE5__maxE' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='59' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__is_signed' type-id='type-id-314' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
+          <var-decl name='__is_signed' type-id='type-id-303' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='63' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='__digits' type-id='type-id-340' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
+          <var-decl name='__digits' type-id='type-id-329' visibility='default' filepath='/usr/include/c++/4.9/ext/numeric_traits.h' line='64' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='new_allocator&lt;bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-132'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-316' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2732'/>
+          <typedef-decl name='const_pointer' type-id='type-id-305' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2732'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-315' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2733'/>
+          <typedef-decl name='const_reference' type-id='type-id-304' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2733'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-181' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2734'/>
@@ -11239,7 +11239,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-245'/>
+            <parameter type-id='type-id-234'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11273,7 +11273,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-248'/>
+            <parameter type-id='type-id-237'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11307,7 +11307,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-137' is-artificial='yes'/>
-            <parameter type-id='type-id-251'/>
+            <parameter type-id='type-id-240'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11321,10 +11321,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;long unsigned int&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-140'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1301' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2744'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1290' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2744'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1300' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2745'/>
+          <typedef-decl name='const_reference' type-id='type-id-1289' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2745'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1911' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2746'/>
@@ -11341,7 +11341,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-141' is-artificial='yes'/>
-            <parameter type-id='type-id-257'/>
+            <parameter type-id='type-id-246'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11375,7 +11375,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-143' is-artificial='yes'/>
-            <parameter type-id='type-id-260'/>
+            <parameter type-id='type-id-249'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11409,7 +11409,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-145' is-artificial='yes'/>
-            <parameter type-id='type-id-263'/>
+            <parameter type-id='type-id-252'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11443,7 +11443,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-147' is-artificial='yes'/>
-            <parameter type-id='type-id-266'/>
+            <parameter type-id='type-id-255'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11457,10 +11457,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionDescription&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-148'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-548' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2758'/>
+          <typedef-decl name='const_pointer' type-id='type-id-537' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2758'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-547' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2157'/>
+          <typedef-decl name='const_reference' type-id='type-id-536' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2157'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1435' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2759'/>
@@ -11477,7 +11477,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-149' is-artificial='yes'/>
-            <parameter type-id='type-id-269'/>
+            <parameter type-id='type-id-258'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11491,10 +11491,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;mongo::optionenvironment::OptionSection&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-150'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-552' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2760'/>
+          <typedef-decl name='const_pointer' type-id='type-id-541' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2760'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-551' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2170'/>
+          <typedef-decl name='const_reference' type-id='type-id-540' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2170'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1437' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2761'/>
@@ -11511,7 +11511,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-151' is-artificial='yes'/>
-            <parameter type-id='type-id-272'/>
+            <parameter type-id='type-id-261'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11525,10 +11525,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionDescription&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-152'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-701' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2762'/>
+          <typedef-decl name='const_pointer' type-id='type-id-690' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2762'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-700' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2763'/>
+          <typedef-decl name='const_reference' type-id='type-id-689' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2763'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1508' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2764'/>
@@ -11545,7 +11545,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-153' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-264'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11574,7 +11574,7 @@
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment17OptionDescriptionEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-153' is-artificial='yes'/>
             <parameter type-id='type-id-2764'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11587,10 +11587,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::optionenvironment::OptionSection&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-154'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-705' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2766'/>
+          <typedef-decl name='const_pointer' type-id='type-id-694' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2766'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-704' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2767'/>
+          <typedef-decl name='const_reference' type-id='type-id-693' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2767'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1510' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2768'/>
@@ -11607,7 +11607,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
-            <parameter type-id='type-id-278'/>
+            <parameter type-id='type-id-267'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11636,7 +11636,7 @@
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo17optionenvironment13OptionSectionEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-155' is-artificial='yes'/>
             <parameter type-id='type-id-2768'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11669,7 +11669,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-157' is-artificial='yes'/>
-            <parameter type-id='type-id-281'/>
+            <parameter type-id='type-id-270'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11703,7 +11703,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-159' is-artificial='yes'/>
-            <parameter type-id='type-id-284'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11717,10 +11717,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-160'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-770' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2778'/>
+          <typedef-decl name='const_pointer' type-id='type-id-759' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2778'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-769' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2779'/>
+          <typedef-decl name='const_reference' type-id='type-id-758' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2779'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1546' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2780'/>
@@ -11737,7 +11737,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-161' is-artificial='yes'/>
-            <parameter type-id='type-id-287'/>
+            <parameter type-id='type-id-276'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11751,10 +11751,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-162'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-774' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2782'/>
+          <typedef-decl name='const_pointer' type-id='type-id-763' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2782'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-773' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2783'/>
+          <typedef-decl name='const_reference' type-id='type-id-762' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2783'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1548' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2498'/>
@@ -11771,7 +11771,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
-            <parameter type-id='type-id-290'/>
+            <parameter type-id='type-id-279'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11806,17 +11806,17 @@
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeISt4pairIKSsSsEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-163' is-artificial='yes'/>
             <parameter type-id='type-id-2498'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt;, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-164'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-897' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2785'/>
+          <typedef-decl name='const_pointer' type-id='type-id-886' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2785'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-896' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2786'/>
+          <typedef-decl name='const_reference' type-id='type-id-885' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2786'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1636' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2787'/>
@@ -11833,7 +11833,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-165' is-artificial='yes'/>
-            <parameter type-id='type-id-293'/>
+            <parameter type-id='type-id-282'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11847,10 +11847,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-166'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1034' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2789'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1023' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2789'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1033' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2790'/>
+          <typedef-decl name='const_reference' type-id='type-id-1022' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2790'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11861,7 +11861,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-296'/>
+            <parameter type-id='type-id-285'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11882,7 +11882,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISsEC2ERKS1_' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsEC2ERKS1_'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-296'/>
+            <parameter type-id='type-id-285'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11896,7 +11896,7 @@
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISsE10deallocateEPSsm' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsE10deallocateEPSsm'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
             <parameter type-id='type-id-2505'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11911,7 +11911,7 @@
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISsE8allocateEmPKv'>
             <parameter type-id='type-id-167' is-artificial='yes'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <parameter type-id='type-id-45'/>
             <return type-id='type-id-2505'/>
           </function-decl>
@@ -11925,8 +11925,8 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISsE8max_sizeEv' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISsE8max_sizeEv'>
-            <parameter type-id='type-id-297' is-artificial='yes'/>
-            <return type-id='type-id-1280'/>
+            <parameter type-id='type-id-286' is-artificial='yes'/>
+            <return type-id='type-id-1269'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11952,7 +11952,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-169' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
+            <parameter type-id='type-id-288'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -11966,10 +11966,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;*&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-170'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1176' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2795'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1165' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2795'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1175' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2796'/>
+          <typedef-decl name='const_reference' type-id='type-id-1164' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2796'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1813' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2797'/>
@@ -11986,7 +11986,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-171' is-artificial='yes'/>
-            <parameter type-id='type-id-302'/>
+            <parameter type-id='type-id-291'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12000,10 +12000,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, mongo::optionenvironment::Value&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-172'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1180' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2799'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1169' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2799'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1179' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2800'/>
+          <typedef-decl name='const_reference' type-id='type-id-1168' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2800'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1816' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2522'/>
@@ -12020,7 +12020,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-173' is-artificial='yes'/>
-            <parameter type-id='type-id-305'/>
+            <parameter type-id='type-id-294'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12034,10 +12034,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-174'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1184' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2802'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1173' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2802'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1183' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2803'/>
+          <typedef-decl name='const_reference' type-id='type-id-1172' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2803'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1819' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2376'/>
@@ -12054,7 +12054,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-175' is-artificial='yes'/>
-            <parameter type-id='type-id-308'/>
+            <parameter type-id='type-id-297'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12068,10 +12068,10 @@
       </class-decl>
       <class-decl name='new_allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-176'>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-1203' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2805'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1192' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2805'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1202' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2806'/>
+          <typedef-decl name='const_reference' type-id='type-id-1191' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2806'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-1851' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2537'/>
@@ -12088,7 +12088,7 @@
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-177' is-artificial='yes'/>
-            <parameter type-id='type-id-311'/>
+            <parameter type-id='type-id-300'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12110,7 +12110,7 @@
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE10deallocateEPS5_m' filepath='/usr/include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10shared_ptrIN5mongo17optionenvironment10ConstraintEEE10deallocateEPS5_m'>
             <parameter type-id='type-id-177' is-artificial='yes'/>
             <parameter type-id='type-id-2537'/>
-            <parameter type-id='type-id-1280'/>
+            <parameter type-id='type-id-1269'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -12128,13 +12128,13 @@
       <class-decl name='__normal_iterator&lt;mongo::optionenvironment::KeyConstraint**, std::vector&lt;mongo::optionenvironment::KeyConstraint*, std::allocator&lt;mongo::optionenvironment::KeyConstraint*&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2319'/>
       <class-decl name='__normal_iterator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;*, std::vector&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt;, std::allocator&lt;std::shared_ptr&lt;mongo::optionenvironment::Constraint&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2346'/>
       <function-decl name='operator!=&lt;const std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPKSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESB_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPKSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESB_'>
-        <parameter type-id='type-id-239' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-239' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-228' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-228' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;std::basic_string&lt;char&gt;*, std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESA_' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPSsSt6vectorISsSaISsEEEEbRKNS_17__normal_iteratorIT_T0_EESA_'>
-        <parameter type-id='type-id-242' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-242' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-231' name='__lhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-231' name='__rhs' filepath='/usr/include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
@@ -12154,7 +12154,7 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-1316'/>
+      <return type-id='type-id-1305'/>
     </function-decl>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-59'/>
@@ -12252,12 +12252,12 @@
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-1312'/>
+      <parameter type-id='type-id-1301'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-339'/>
+      <parameter type-id='type-id-328'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12339,7 +12339,7 @@
       <return type-id='type-id-65'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1914'/>
+      <parameter type-id='type-id-1915'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='/usr/include/stdlib.h' line='549' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12408,7 +12408,7 @@
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-46'/>
     </function-decl>
@@ -12458,104 +12458,104 @@
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-46'/>
       <parameter type-id='type-id-59'/>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-1904'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-1904'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1293'/>
+      <parameter type-id='type-id-1282'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcscpy' filepath='/usr/include/wchar.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcsncpy' filepath='/usr/include/wchar.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcsncat' filepath='/usr/include/wchar.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wmemcpy' filepath='/usr/include/wchar.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='wmemmove' filepath='/usr/include/wchar.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-46'/>
       <return type-id='type-id-1919'/>
     </function-decl>
@@ -12574,77 +12574,77 @@
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-335'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-59'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-103'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-59'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
-      <parameter type-id='type-id-337'/>
+      <parameter type-id='type-id-326'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1309'/>
+      <parameter type-id='type-id-1298'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1319'/>
+      <parameter type-id='type-id-1308'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='450' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-21'/>
     </function-decl>
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-82'/>
     </function-decl>
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1920'/>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-102'/>
@@ -12656,71 +12656,71 @@
     </function-decl>
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='594' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='wscanf' filepath='/usr/include/wchar.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='swscanf' filepath='/usr/include/wchar.h' line='645' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='701' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-1905'/>
       <return type-id='type-id-23'/>
     </function-decl>
@@ -12756,7 +12756,7 @@
       <return type-id='type-id-1919'/>
     </function-decl>
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1308'/>
+      <parameter type-id='type-id-1297'/>
       <parameter type-id='type-id-105'/>
       <return type-id='type-id-23'/>
     </function-decl>
@@ -12768,8 +12768,8 @@
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1919'/>
       <parameter type-id='type-id-46'/>
-      <parameter type-id='type-id-1308'/>
-      <parameter type-id='type-id-1295'/>
+      <parameter type-id='type-id-1297'/>
+      <parameter type-id='type-id-1284'/>
       <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='wctype' filepath='/usr/include/wctype.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12791,18 +12791,18 @@
       <return type-id='type-id-87'/>
     </function-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='AssertionException' size-in-bits='256' visibility='default' filepath='src/mongo/util/assert_util.h' line='151' column='1' id='type-id-347'>
+      <class-decl name='AssertionException' size-in-bits='256' visibility='default' filepath='src/mongo/util/assert_util.h' line='151' column='1' id='type-id-336'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1949'/>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-422'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-411'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
@@ -12810,84 +12810,84 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' filepath='src/mongo/util/assert_util.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='AssertionException' mangled-name='_ZN5mongo18AssertionExceptionC2ERKSsi' filepath='src/mongo/util/assert_util.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionC2ERKSsi'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' mangled-name='_ZN5mongo18AssertionExceptionD0Ev' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionD0Ev'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~AssertionException' mangled-name='_ZN5mongo18AssertionExceptionD2Ev' filepath='src/mongo/util/assert_util.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18AssertionExceptionD2Ev'>
-            <parameter type-id='type-id-1320' is-artificial='yes'/>
+            <parameter type-id='type-id-1309' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='7'>
           <function-decl name='severe' mangled-name='_ZNK5mongo18AssertionException6severeEv' filepath='src/mongo/util/assert_util.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18AssertionException6severeEv'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='8'>
           <function-decl name='isUserAssertion' mangled-name='_ZNK5mongo18AssertionException15isUserAssertionEv' filepath='src/mongo/util/assert_util.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18AssertionException15isUserAssertionEv'>
-            <parameter type-id='type-id-349' is-artificial='yes'/>
+            <parameter type-id='type-id-338' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-350'>
+      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-339'>
         <member-type access='public'>
           <typedef-decl name='WordType' type-id='type-id-50' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-2808'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_value' type-id='type-id-1029' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
+          <var-decl name='_value' type-id='type-id-1018' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-2808'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj'>
-            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1310' is-artificial='yes'/>
             <parameter type-id='type-id-2808'/>
             <return type-id='type-id-2808'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-365'>
+      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-354'>
         <member-type access='public'>
           <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-2809'/>
         </member-type>
@@ -12902,13 +12902,13 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
@@ -12916,14 +12916,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1329' is-artificial='yes'/>
+            <parameter type-id='type-id-1318' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-2809'/>
@@ -12931,101 +12931,101 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-369'>
+      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-358'>
         <member-type access='public'>
-          <class-decl name='SorterDeserializeSettings' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='569' column='1' id='type-id-373'/>
+          <class-decl name='SorterDeserializeSettings' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='569' column='1' id='type-id-362'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='kMinBSONLength' type-id='type-id-332' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='96' column='1'/>
+          <var-decl name='kMinBSONLength' type-id='type-id-321' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='96' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_objdata' type-id='type-id-59' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='600' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_ownedBuffer' type-id='type-id-477' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
+          <var-decl name='_ownedBuffer' type-id='type-id-466' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-477'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-466'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-1320'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-371'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EPKc' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2EPKc'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='objdata' mangled-name='_ZNK5mongo7BSONObj7objdataEv' filepath='src/mongo/bson/bsonobj.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7objdataEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-59'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='objsize' mangled-name='_ZNK5mongo7BSONObj7objsizeEv' filepath='src/mongo/bson/bsonobj.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7objsizeEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='isValid' mangled-name='_ZNK5mongo7BSONObj7isValidEv' filepath='src/mongo/bson/bsonobj.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7isValidEv'>
-            <parameter type-id='type-id-372' is-artificial='yes'/>
+            <parameter type-id='type-id-361' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='init' mangled-name='_ZN5mongo7BSONObj4initEPKc' filepath='src/mongo/bson/bsonobj.h' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObj4initEPKc'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1321' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObjBuilder' size-in-bits='768' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='59' column='1' id='type-id-376'>
+      <class-decl name='BSONObjBuilder' size-in-bits='768' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='59' column='1' id='type-id-365'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_b' type-id='type-id-1346' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='727' column='1'/>
+          <var-decl name='_b' type-id='type-id-1335' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='727' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_buf' type-id='type-id-1345' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='728' column='1'/>
+          <var-decl name='_buf' type-id='type-id-1334' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='728' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='320'>
           <var-decl name='_offset' type-id='type-id-23' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='729' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
-          <var-decl name='_s' type-id='type-id-380' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='730' column='1'/>
+          <var-decl name='_s' type-id='type-id-369' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='730' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='640'>
-          <var-decl name='_tracker' type-id='type-id-1343' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='731' column='1'/>
+          <var-decl name='_tracker' type-id='type-id-1332' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='731' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='704'>
           <var-decl name='_doneCalled' type-id='type-id-1' visibility='default' filepath='src/mongo/bson/bsonobjbuilder.h' line='732' column='1'/>
@@ -13038,139 +13038,139 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-378'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1346'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-1335'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-392'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-381'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2Ei' filepath='src/mongo/bson/bsonobjbuilder.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderC2Ei'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderD2Ev' filepath='src/mongo/bson/bsonobjbuilder.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderD2Ev'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='appendArray' mangled-name='_ZN5mongo14BSONObjBuilder11appendArrayENS_10StringDataERKNS_7BSONObjE' filepath='src/mongo/bson/bsonobjbuilder.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder11appendArrayENS_10StringDataERKNS_7BSONObjE'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-371'/>
-            <return type-id='type-id-1333'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-360'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi' filepath='src/mongo/bson/bsonobjbuilder.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEi'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-1333'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEPKci' filepath='src/mongo/bson/bsonobjbuilder.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataEPKci'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-1333'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataERKSs' filepath='src/mongo/bson/bsonobjbuilder.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendENS_10StringDataERKSs'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-1206'/>
-            <return type-id='type-id-1333'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-1195'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='done' mangled-name='_ZN5mongo14BSONObjBuilder4doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder4doneEv'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <return type-id='type-id-369'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <return type-id='type-id-358'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='numStr' mangled-name='_ZN5mongo14BSONObjBuilder6numStrEi' filepath='src/mongo/bson/bsonobjbuilder.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6numStrEi'>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-1204'/>
+            <return type-id='type-id-1193'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_done' mangled-name='_ZN5mongo14BSONObjBuilder5_doneEv' filepath='src/mongo/bson/bsonobjbuilder.h' line='706' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder5_doneEv'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
             <return type-id='type-id-39'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN5mongo14BSONObjBuilder6appendISsEERS0_NS_10StringDataERKSt6vectorIT_SaIS5_EE' filepath='src/mongo/bson/bsonobjbuilder.h' line='872' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendISsEERS0_NS_10StringDataERKSt6vectorIT_SaIS5_EE'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-1278'/>
-            <return type-id='type-id-1333'/>
+            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-1267'/>
+            <return type-id='type-id-1322'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObjBuilderValueStream' size-in-bits='256' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='218' column='1' id='type-id-380'>
+      <class-decl name='BSONObjBuilderValueStream' size-in-bits='256' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='218' column='1' id='type-id-369'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_fieldName' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='257' column='1'/>
+          <var-decl name='_fieldName' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='257' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_builder' type-id='type-id-1334' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='258' column='1'/>
+          <var-decl name='_builder' type-id='type-id-1323' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='258' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_subobj' type-id='type-id-1216' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='264' column='1'/>
+          <var-decl name='_subobj' type-id='type-id-1205' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='264' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BSONObjBuilderValueStream' filepath='src/mongo/bson/bsonmisc.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1339' is-artificial='yes'/>
-            <parameter type-id='type-id-382'/>
+            <parameter type-id='type-id-1328' is-artificial='yes'/>
+            <parameter type-id='type-id-371'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjBuilderValueStream' filepath='src/mongo/bson/bsonmisc.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1339' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1328' is-artificial='yes'/>
+            <parameter type-id='type-id-1323'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObjIterator' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='632' column='1' id='type-id-384'>
+      <class-decl name='BSONObjIterator' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='632' column='1' id='type-id-373'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_pos' type-id='type-id-59' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='723' column='1'/>
         </data-member>
@@ -13179,21 +13179,21 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1341' is-artificial='yes'/>
-            <parameter type-id='type-id-371'/>
+            <parameter type-id='type-id-1330' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1341' is-artificial='yes'/>
+            <parameter type-id='type-id-1330' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-59'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONSizeTracker' size-in-bits='352' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='271' column='1' id='type-id-390'>
+      <class-decl name='BSONSizeTracker' size-in-bits='352' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='271' column='1' id='type-id-379'>
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='src/mongo/bson/bsonmisc.h' line='299' column='1' id='type-id-2810'>
             <underlying-type type-id='type-id-88'/>
@@ -13208,26 +13208,26 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONSizeTracker' filepath='src/mongo/bson/bsonmisc.h' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1332' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~BSONSizeTracker' filepath='src/mongo/bson/bsonmisc.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1332' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='got' mangled-name='_ZN5mongo15BSONSizeTracker3gotEi' filepath='src/mongo/bson/bsonmisc.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15BSONSizeTracker3gotEi'>
-            <parameter type-id='type-id-1343' is-artificial='yes'/>
+            <parameter type-id='type-id-1332' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BufReader' size-in-bits='192' visibility='default' filepath='src/mongo/util/bufreader.h' line='42' column='1' id='type-id-397'>
+      <class-decl name='BufReader' size-in-bits='192' visibility='default' filepath='src/mongo/util/bufreader.h' line='42' column='1' id='type-id-386'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_start' type-id='type-id-45' visibility='default' filepath='src/mongo/util/bufreader.h' line='145' column='1'/>
         </data-member>
@@ -13239,21 +13239,21 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
-            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-1337' is-artificial='yes'/>
+            <parameter type-id='type-id-388'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1337' is-artificial='yes'/>
             <parameter type-id='type-id-45'/>
             <parameter type-id='type-id-50'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-401'>
+      <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-390'>
         <member-type access='public'>
           <typedef-decl name='bytes_type' type-id='type-id-59' filepath='src/mongo/base/data_view.h' line='41' column='1' id='type-id-2811'/>
         </member-type>
@@ -13262,110 +13262,110 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-2811'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' mangled-name='_ZN5mongo13ConstDataViewC2EPKc' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo13ConstDataViewC2EPKc'>
-            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-2811'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='view' mangled-name='_ZNK5mongo13ConstDataView4viewEm' filepath='src/mongo/base/data_view.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo13ConstDataView4viewEm'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
             <return type-id='type-id-2811'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEET_m' filepath='src/mongo/base/data_view.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEET_m'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
-            <return type-id='type-id-450'/>
+            <return type-id='type-id-439'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='read&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEERKS0_PT_m' filepath='src/mongo/base/data_view.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo13ConstDataView4readINS_12LittleEndianIiEEEERKS0_PT_m'>
-            <parameter type-id='type-id-404' is-artificial='yes'/>
-            <parameter type-id='type-id-1369'/>
+            <parameter type-id='type-id-393' is-artificial='yes'/>
+            <parameter type-id='type-id-1358'/>
             <parameter type-id='type-id-46'/>
-            <return type-id='type-id-403'/>
+            <return type-id='type-id-392'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-405'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-401'/>
+      <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-394'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-390'/>
         <member-type access='public'>
           <typedef-decl name='bytes_type' type-id='type-id-39' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-2812'/>
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
+            <parameter type-id='type-id-1340' is-artificial='yes'/>
             <parameter type-id='type-id-2812'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' mangled-name='_ZN5mongo8DataViewC2EPc' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataViewC2EPc'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
+            <parameter type-id='type-id-1340' is-artificial='yes'/>
             <parameter type-id='type-id-2812'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='view' mangled-name='_ZNK5mongo8DataView4viewEm' filepath='src/mongo/base/data_view.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo8DataView4viewEm'>
-            <parameter type-id='type-id-407' is-artificial='yes'/>
+            <parameter type-id='type-id-396' is-artificial='yes'/>
             <parameter type-id='type-id-46'/>
             <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIiEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataView5writeINS_12LittleEndianIiEEEERS0_RKT_m'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
-            <parameter type-id='type-id-452'/>
+            <parameter type-id='type-id-1340' is-artificial='yes'/>
+            <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-46'/>
-            <return type-id='type-id-1350'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;char&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIcEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataView5writeINS_12LittleEndianIcEEEERS0_RKT_m'>
-            <parameter type-id='type-id-1351' is-artificial='yes'/>
-            <parameter type-id='type-id-448'/>
+            <parameter type-id='type-id-1340' is-artificial='yes'/>
+            <parameter type-id='type-id-437'/>
             <parameter type-id='type-id-46'/>
-            <return type-id='type-id-1350'/>
+            <return type-id='type-id-1339'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Date_t' size-in-bits='64' visibility='default' filepath='src/mongo/util/time_support.h' line='95' column='1' id='type-id-411'>
+      <class-decl name='Date_t' size-in-bits='64' visibility='default' filepath='src/mongo/util/time_support.h' line='95' column='1' id='type-id-400'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='millis' type-id='type-id-28' visibility='default' filepath='src/mongo/util/time_support.h' line='259' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-1042'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1031'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <parameter type-id='type-id-28'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-414'>
+      <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-403'>
         <member-type access='public'>
           <enum-decl name='RoundingMode' filepath='src/mongo/platform/decimal128.h' line='87' column='1' id='type-id-2813'>
             <underlying-type type-id='type-id-88'/>
@@ -13398,68 +13398,68 @@
           </class-decl>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='enabled' type-id='type-id-314' visibility='default' filepath='src/mongo/platform/decimal128.h' line='56' column='1'/>
+          <var-decl name='enabled' type-id='type-id-303' visibility='default' filepath='src/mongo/platform/decimal128.h' line='56' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestPositive' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='67' column='1'/>
+          <var-decl name='kLargestPositive' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='67' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kSmallestPositive' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='68' column='1'/>
+          <var-decl name='kSmallestPositive' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='68' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestNegative' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='69' column='1'/>
+          <var-decl name='kLargestNegative' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='69' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kSmallestNegative' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='70' column='1'/>
+          <var-decl name='kSmallestNegative' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='70' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestNegativeExponentZero' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='72' column='1'/>
+          <var-decl name='kLargestNegativeExponentZero' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kPositiveInfinity' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='74' column='1'/>
+          <var-decl name='kPositiveInfinity' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='74' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kNegativeInfinity' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='75' column='1'/>
+          <var-decl name='kNegativeInfinity' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kPositiveNaN' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='76' column='1'/>
+          <var-decl name='kPositiveNaN' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kNegativeNaN' type-id='type-id-415' visibility='default' filepath='src/mongo/platform/decimal128.h' line='77' column='1'/>
+          <var-decl name='kNegativeNaN' type-id='type-id-404' visibility='default' filepath='src/mongo/platform/decimal128.h' line='77' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_value' type-id='type-id-2815' visibility='default' filepath='src/mongo/platform/decimal128.h' line='306' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <parameter type-id='type-id-2815'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <parameter type-id='type-id-75'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <parameter type-id='type-id-28'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <parameter type-id='type-id-21'/>
             <parameter type-id='type-id-2813'/>
             <return type-id='type-id-65'/>
@@ -13467,8 +13467,8 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1355' is-artificial='yes'/>
-            <parameter type-id='type-id-1204'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1193'/>
             <parameter type-id='type-id-2813'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -13476,7 +13476,7 @@
       </class-decl>
       <class-decl name='ErrorCodes' size-in-bits='8' visibility='default' filepath='build/debug/mongo/base/error_codes.h' line='45' column='1' id='type-id-2816'>
         <member-type access='public'>
-          <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='47' column='1' id='type-id-418'>
+          <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='47' column='1' id='type-id-407'>
             <underlying-type type-id='type-id-88'/>
             <enumerator name='OK' value='0'/>
             <enumerator name='InternalError' value='1'/>
@@ -13640,39 +13640,39 @@
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='ExportedScramIterationCountParameter' size-in-bits='256' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='177' column='1' id='type-id-1357'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-424'/>
+      <class-decl name='ExportedScramIterationCountParameter' size-in-bits='256' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='177' column='1' id='type-id-1346'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-413'/>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExportedScramIterationCountParameter' filepath='src/mongo/db/auth/sasl_options.cpp' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExportedScramIterationCountParameter' mangled-name='_ZN5mongo36ExportedScramIterationCountParameterC2Ev' filepath='src/mongo/db/auth/sasl_options.cpp' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo36ExportedScramIterationCountParameterC2Ev'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='7'>
           <function-decl name='validate' mangled-name='_ZN5mongo36ExportedScramIterationCountParameter8validateERKi' filepath='src/mongo/db/auth/sasl_options.cpp' line='186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo36ExportedScramIterationCountParameter8validateERKi'>
-            <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-341'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-330'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ExportedServerParameter&lt;int&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-424'>
+      <class-decl name='ExportedServerParameter&lt;int&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-413'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2007'/>
         <data-member access='protected' layout-offset-in-bits='192'>
-          <var-decl name='_value' type-id='type-id-1315' visibility='default' filepath='src/mongo/db/server_parameters.h' line='148' column='1'/>
+          <var-decl name='_value' type-id='type-id-1304' visibility='default' filepath='src/mongo/db/server_parameters.h' line='148' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
-            <parameter type-id='type-id-1315'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
+            <parameter type-id='type-id-1304'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-65'/>
@@ -13680,10 +13680,10 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterIiEC2EPNS_18ServerParameterSetERKSsPibb' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiEC2EPNS_18ServerParameterSetERKSsPibb'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
-            <parameter type-id='type-id-1315'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
+            <parameter type-id='type-id-1304'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-65'/>
@@ -13691,79 +13691,79 @@
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterIiED0Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiED0Ev'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterIiED2Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiED2Ev'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='append' mangled-name='_ZN5mongo23ExportedServerParameterIiE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs' filepath='src/mongo/db/server_parameters.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
             <parameter type-id='type-id-2004'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1322'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterIiE3setERKNS_11BSONElementE' filepath='src/mongo/db/server_parameters_inline.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiE3setERKNS_11BSONElementE'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-367'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-356'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='setFromString' mangled-name='_ZN5mongo23ExportedServerParameterIiE13setFromStringERKSs' filepath='src/mongo/db/server_parameters.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='5'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterIiE3setERKi' filepath='src/mongo/db/server_parameters_inline.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiE3setERKi'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-341'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-330'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='6'>
           <function-decl name='get' mangled-name='_ZNK5mongo23ExportedServerParameterIiE3getEv' filepath='src/mongo/db/server_parameters.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo23ExportedServerParameterIiE3getEv'>
-            <parameter type-id='type-id-426' is-artificial='yes'/>
-            <return type-id='type-id-341'/>
+            <parameter type-id='type-id-415' is-artificial='yes'/>
+            <return type-id='type-id-330'/>
           </function-decl>
         </member-function>
         <member-function access='protected' vtable-offset='7'>
           <function-decl name='validate' mangled-name='_ZN5mongo23ExportedServerParameterIiE8validateERKi' filepath='src/mongo/db/server_parameters.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterIiE8validateERKi'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-341'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1348' is-artificial='yes'/>
+            <parameter type-id='type-id-330'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ExportedServerParameter&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-427'>
+      <class-decl name='ExportedServerParameter&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-416'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2007'/>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_value' type-id='type-id-1750' visibility='default' filepath='src/mongo/db/server_parameters.h' line='148' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
@@ -13772,9 +13772,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISsEC2EPNS_18ServerParameterSetERKSsPSsbb' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsEC2EPNS_18ServerParameterSetERKSsPSsbb'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-1750'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
@@ -13783,79 +13783,79 @@
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISsED0Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsED0Ev'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISsED2Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsED2Ev'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='append' mangled-name='_ZN5mongo23ExportedServerParameterISsE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs' filepath='src/mongo/db/server_parameters.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
             <parameter type-id='type-id-2004'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1322'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterISsE3setERKNS_11BSONElementE' filepath='src/mongo/db/server_parameters_inline.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsE3setERKNS_11BSONElementE'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-367'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-356'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='setFromString' mangled-name='_ZN5mongo23ExportedServerParameterISsE13setFromStringERKSs' filepath='src/mongo/db/server_parameters.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='5'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterISsE3setERKSs' filepath='src/mongo/db/server_parameters_inline.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsE3setERKSs'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1022'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='6'>
           <function-decl name='get' mangled-name='_ZNK5mongo23ExportedServerParameterISsE3getEv' filepath='src/mongo/db/server_parameters.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo23ExportedServerParameterISsE3getEv'>
-            <parameter type-id='type-id-429' is-artificial='yes'/>
-            <return type-id='type-id-1033'/>
+            <parameter type-id='type-id-418' is-artificial='yes'/>
+            <return type-id='type-id-1022'/>
           </function-decl>
         </member-function>
         <member-function access='protected' vtable-offset='7'>
           <function-decl name='validate' mangled-name='_ZN5mongo23ExportedServerParameterISsE8validateERKSs' filepath='src/mongo/db/server_parameters.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISsE8validateERKSs'>
-            <parameter type-id='type-id-1360' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1349' is-artificial='yes'/>
+            <parameter type-id='type-id-1022'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ExportedServerParameter&lt;std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-430'>
+      <class-decl name='ExportedServerParameter&lt;std::vector&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt; &gt; &gt; &gt;' size-in-bits='256' visibility='default' filepath='src/mongo/db/server_parameters.h' line='111' column='1' id='type-id-419'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2007'/>
         <data-member access='protected' layout-offset-in-bits='192'>
           <var-decl name='_value' type-id='type-id-1897' visibility='default' filepath='src/mongo/db/server_parameters.h' line='148' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-1897'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
@@ -13864,9 +13864,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEEC2EPNS_18ServerParameterSetERKSsPS3_bb' filepath='src/mongo/db/server_parameters.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEEC2EPNS_18ServerParameterSetERKSsPS3_bb'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-1375'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1364'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-1897'/>
             <parameter type-id='type-id-1'/>
             <parameter type-id='type-id-1'/>
@@ -13875,107 +13875,107 @@
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED0Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED0Ev'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='-1'>
           <function-decl name='~ExportedServerParameter' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED2Ev' filepath='src/mongo/db/server_parameters.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEED2Ev'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
             <parameter type-id='type-id-23' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='append' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs' filepath='src/mongo/db/server_parameters.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE6appendEPNS_16OperationContextERNS_14BSONObjBuilderERKSs'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
             <parameter type-id='type-id-2004'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1322'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3setERKNS_11BSONElementE' filepath='src/mongo/db/server_parameters_inline.h' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3setERKNS_11BSONElementE'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-367'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-356'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='setFromString' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE13setFromStringERKSs' filepath='src/mongo/db/server_parameters.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='5'>
           <function-decl name='set' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3setERKS3_' filepath='src/mongo/db/server_parameters_inline.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3setERKS3_'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1267'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes' vtable-offset='6'>
           <function-decl name='get' mangled-name='_ZNK5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3getEv' filepath='src/mongo/db/server_parameters.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo23ExportedServerParameterISt6vectorISsSaISsEEE3getEv'>
-            <parameter type-id='type-id-432' is-artificial='yes'/>
-            <return type-id='type-id-1278'/>
+            <parameter type-id='type-id-421' is-artificial='yes'/>
+            <return type-id='type-id-1267'/>
           </function-decl>
         </member-function>
         <member-function access='protected' vtable-offset='7'>
           <function-decl name='validate' mangled-name='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE8validateERKS3_' filepath='src/mongo/db/server_parameters.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23ExportedServerParameterISt6vectorISsSaISsEEE8validateERKS3_'>
-            <parameter type-id='type-id-1361' is-artificial='yes'/>
-            <parameter type-id='type-id-1278'/>
-            <return type-id='type-id-484'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1267'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='InitializerContext' size-in-bits='576' visibility='default' filepath='src/mongo/base/initializer_context.h' line='43' column='1' id='type-id-433'>
+      <class-decl name='InitializerContext' size-in-bits='576' visibility='default' filepath='src/mongo/base/initializer_context.h' line='43' column='1' id='type-id-422'>
         <member-type access='public'>
-          <typedef-decl name='ArgumentVector' type-id='type-id-1276' filepath='src/mongo/base/initializer_context.h' line='47' column='1' id='type-id-437'/>
+          <typedef-decl name='ArgumentVector' type-id='type-id-1265' filepath='src/mongo/base/initializer_context.h' line='47' column='1' id='type-id-426'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='EnvironmentMap' type-id='type-id-1157' filepath='src/mongo/base/initializer_context.h' line='48' column='1' id='type-id-440'/>
+          <typedef-decl name='EnvironmentMap' type-id='type-id-1146' filepath='src/mongo/base/initializer_context.h' line='48' column='1' id='type-id-429'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_args' type-id='type-id-437' visibility='default' filepath='src/mongo/base/initializer_context.h' line='60' column='1'/>
+          <var-decl name='_args' type-id='type-id-426' visibility='default' filepath='src/mongo/base/initializer_context.h' line='60' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_env' type-id='type-id-440' visibility='default' filepath='src/mongo/base/initializer_context.h' line='61' column='1'/>
+          <var-decl name='_env' type-id='type-id-429' visibility='default' filepath='src/mongo/base/initializer_context.h' line='61' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='InitializerContext' filepath='src/mongo/base/initializer_context.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <parameter type-id='type-id-435'/>
+            <parameter type-id='type-id-1352' is-artificial='yes'/>
+            <parameter type-id='type-id-424'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='InitializerContext' filepath='src/mongo/base/initializer_context.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1363' is-artificial='yes'/>
-            <parameter type-id='type-id-439'/>
-            <parameter type-id='type-id-442'/>
+            <parameter type-id='type-id-1352' is-artificial='yes'/>
+            <parameter type-id='type-id-428'/>
+            <parameter type-id='type-id-431'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Labeler' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='130' column='1' id='type-id-1365'>
+      <class-decl name='Labeler' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='130' column='1' id='type-id-1354'>
         <member-type access='public'>
-          <class-decl name='Label' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='132' column='1' id='type-id-443'>
+          <class-decl name='Label' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='132' column='1' id='type-id-432'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='l_' type-id='type-id-59' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='134' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Label' filepath='src/mongo/bson/bsonmisc.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1367' is-artificial='yes'/>
+                <parameter type-id='type-id-1356' is-artificial='yes'/>
                 <parameter type-id='type-id-59'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -13983,21 +13983,21 @@
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='l_' type-id='type-id-445' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='148' column='1'/>
+          <var-decl name='l_' type-id='type-id-434' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='148' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='s_' type-id='type-id-1339' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='149' column='1'/>
+          <var-decl name='s_' type-id='type-id-1328' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='149' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Labeler' filepath='src/mongo/bson/bsonmisc.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1366' is-artificial='yes'/>
-            <parameter type-id='type-id-445'/>
-            <parameter type-id='type-id-1339'/>
+            <parameter type-id='type-id-1355' is-artificial='yes'/>
+            <parameter type-id='type-id-434'/>
+            <parameter type-id='type-id-1328'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-463'>
+      <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-452'>
         <member-type access='public'>
           <class-decl name='Increment' size-in-bits='24' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='181' column='1' id='type-id-2817'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -14023,75 +14023,75 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
+            <parameter type-id='type-id-1360' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1360' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
+            <parameter type-id='type-id-1360' is-artificial='yes'/>
             <parameter type-id='type-id-1907'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
+            <parameter type-id='type-id-1360' is-artificial='yes'/>
             <parameter type-id='type-id-76'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
+            <parameter type-id='type-id-1360' is-artificial='yes'/>
             <parameter type-id='type-id-2819'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Ordering' size-in-bits='32' visibility='default' filepath='src/mongo/bson/ordering.h' line='43' column='1' id='type-id-467'>
+      <class-decl name='Ordering' size-in-bits='32' visibility='default' filepath='src/mongo/bson/ordering.h' line='43' column='1' id='type-id-456'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='bits' type-id='type-id-50' visibility='default' filepath='src/mongo/bson/ordering.h' line='44' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1372' is-artificial='yes'/>
+            <parameter type-id='type-id-1361' is-artificial='yes'/>
             <parameter type-id='type-id-50'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1372' is-artificial='yes'/>
-            <parameter type-id='type-id-469'/>
+            <parameter type-id='type-id-1361' is-artificial='yes'/>
+            <parameter type-id='type-id-458'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ServerParameterSet' size-in-bits='384' visibility='default' filepath='src/mongo/db/server_parameters.h' line='90' column='1' id='type-id-471'>
+      <class-decl name='ServerParameterSet' size-in-bits='384' visibility='default' filepath='src/mongo/db/server_parameters.h' line='90' column='1' id='type-id-460'>
         <member-type access='public'>
-          <typedef-decl name='Map' type-id='type-id-1146' filepath='src/mongo/db/server_parameters.h' line='92' column='1' id='type-id-474'/>
+          <typedef-decl name='Map' type-id='type-id-1135' filepath='src/mongo/db/server_parameters.h' line='92' column='1' id='type-id-463'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_map' type-id='type-id-474' visibility='default' filepath='src/mongo/db/server_parameters.h' line='103' column='1'/>
+          <var-decl name='_map' type-id='type-id-463' visibility='default' filepath='src/mongo/db/server_parameters.h' line='103' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-477'>
+      <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-466'>
         <member-type access='public'>
-          <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-481'>
+          <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-470'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_refCount' type-id='type-id-2821' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='111' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1380' is-artificial='yes'/>
+                <parameter type-id='type-id-1369' is-artificial='yes'/>
                 <parameter type-id='type-id-2808'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -14103,58 +14103,58 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1367' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
-            <parameter type-id='type-id-479'/>
+            <parameter type-id='type-id-1367' is-artificial='yes'/>
+            <parameter type-id='type-id-468'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
-            <parameter type-id='type-id-1377'/>
+            <parameter type-id='type-id-1367' is-artificial='yes'/>
+            <parameter type-id='type-id-1366'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
-            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1367' is-artificial='yes'/>
+            <parameter type-id='type-id-1369'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2Ev'>
-            <parameter type-id='type-id-1378' is-artificial='yes'/>
+            <parameter type-id='type-id-1367' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-484'>
+      <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-473'>
         <member-type access='private'>
           <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1384'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='refs' type-id='type-id-2821' visibility='default' filepath='src/mongo/base/status.h' line='124' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='32'>
-              <var-decl name='code' type-id='type-id-419' visibility='default' filepath='src/mongo/base/status.h' line='125' column='1'/>
+              <var-decl name='code' type-id='type-id-408' visibility='default' filepath='src/mongo/base/status.h' line='125' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='reason' type-id='type-id-1205' visibility='default' filepath='src/mongo/base/status.h' line='126' column='1'/>
+              <var-decl name='reason' type-id='type-id-1194' visibility='default' filepath='src/mongo/base/status.h' line='126' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='location' type-id='type-id-340' visibility='default' filepath='src/mongo/base/status.h' line='127' column='1'/>
+              <var-decl name='location' type-id='type-id-329' visibility='default' filepath='src/mongo/base/status.h' line='127' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='ErrorInfo' filepath='src/mongo/base/status.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1385' is-artificial='yes'/>
-                <parameter type-id='type-id-418'/>
-                <parameter type-id='type-id-1204'/>
+                <parameter type-id='type-id-407'/>
+                <parameter type-id='type-id-1193'/>
                 <parameter type-id='type-id-23'/>
                 <return type-id='type-id-65'/>
               </function-decl>
@@ -14167,8 +14167,8 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1383' is-artificial='yes'/>
-            <parameter type-id='type-id-418'/>
-            <parameter type-id='type-id-1204'/>
+            <parameter type-id='type-id-407'/>
+            <parameter type-id='type-id-1193'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -14176,7 +14176,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1383' is-artificial='yes'/>
-            <parameter type-id='type-id-486'/>
+            <parameter type-id='type-id-475'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14202,7 +14202,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status2OKEv'>
-            <return type-id='type-id-484'/>
+            <return type-id='type-id-473'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
@@ -14221,14 +14221,14 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Status4isOKEv'>
-            <parameter type-id='type-id-487' is-artificial='yes'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='code' mangled-name='_ZNK5mongo6Status4codeEv' filepath='src/mongo/base/status.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Status4codeEv'>
-            <parameter type-id='type-id-487' is-artificial='yes'/>
-            <return type-id='type-id-418'/>
+            <parameter type-id='type-id-476' is-artificial='yes'/>
+            <return type-id='type-id-407'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
@@ -14244,30 +14244,30 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StringBuilderImpl&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='343' column='1' id='type-id-488'>
+      <class-decl name='StringBuilderImpl&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='343' column='1' id='type-id-477'>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_DBL_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='346' column='1'/>
+          <var-decl name='MONGO_DBL_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='346' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S32_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='347' column='1'/>
+          <var-decl name='MONGO_S32_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='347' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_U32_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='348' column='1'/>
+          <var-decl name='MONGO_U32_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='348' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S64_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='349' column='1'/>
+          <var-decl name='MONGO_S64_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='349' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_U64_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='350' column='1'/>
+          <var-decl name='MONGO_U64_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='350' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S16_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='351' column='1'/>
+          <var-decl name='MONGO_S16_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='351' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_PTR_SIZE' type-id='type-id-622' visibility='default' filepath='src/mongo/bson/util/builder.h' line='352' column='1'/>
+          <var-decl name='MONGO_PTR_SIZE' type-id='type-id-611' visibility='default' filepath='src/mongo/bson/util/builder.h' line='352' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_buf' type-id='type-id-503' visibility='default' filepath='src/mongo/bson/util/builder.h' line='434' column='1'/>
+          <var-decl name='_buf' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/util/builder.h' line='434' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14278,14 +14278,14 @@
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-490'/>
+            <parameter type-id='type-id-479'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE'>
             <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-1388'/>
           </function-decl>
         </member-function>
@@ -14311,14 +14311,14 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='str' mangled-name='_ZNK5mongo17StringBuilderImplINS_16TrivialAllocatorEE3strEv' filepath='src/mongo/bson/util/builder.h' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17StringBuilderImplINS_16TrivialAllocatorEE3strEv'>
-            <parameter type-id='type-id-491' is-artificial='yes'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-480' is-artificial='yes'/>
+            <return type-id='type-id-1193'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE'>
             <parameter type-id='type-id-1389' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14332,7 +14332,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-492'>
+      <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-481'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_data' type-id='type-id-59' visibility='default' filepath='src/mongo/base/string_data.h' line='167' column='1'/>
         </data-member>
@@ -14363,7 +14363,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14383,26 +14383,26 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKSs' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2ERKSs'>
             <parameter type-id='type-id-1390' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='size' mangled-name='_ZNK5mongo10StringData4sizeEv' filepath='src/mongo/base/string_data.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StringData4sizeEv'>
-            <parameter type-id='type-id-495' is-artificial='yes'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
             <return type-id='type-id-46'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StringData6copyToEPcb'>
-            <parameter type-id='type-id-495' is-artificial='yes'/>
+            <parameter type-id='type-id-484' is-artificial='yes'/>
             <parameter type-id='type-id-39'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Timestamp' size-in-bits='64' visibility='default' filepath='src/mongo/bson/timestamp.h' line='40' column='1' id='type-id-496'>
+      <class-decl name='Timestamp' size-in-bits='64' visibility='default' filepath='src/mongo/bson/timestamp.h' line='40' column='1' id='type-id-485'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='i' type-id='type-id-50' visibility='default' filepath='src/mongo/bson/timestamp.h' line='123' column='1'/>
         </data-member>
@@ -14412,7 +14412,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1391' is-artificial='yes'/>
-            <parameter type-id='type-id-411'/>
+            <parameter type-id='type-id-400'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14470,7 +14470,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_BufBuilder&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='120' column='1' id='type-id-503'>
+      <class-decl name='_BufBuilder&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='120' column='1' id='type-id-492'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='al' type-id='type-id-1392' visibility='default' filepath='src/mongo/bson/util/builder.h' line='124' column='1'/>
         </data-member>
@@ -14489,7 +14489,7 @@
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1395' is-artificial='yes'/>
-            <parameter type-id='type-id-505'/>
+            <parameter type-id='type-id-494'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14545,7 +14545,7 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='len' mangled-name='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE3lenEv' filepath='src/mongo/bson/util/builder.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE3lenEv'>
-            <parameter type-id='type-id-506' is-artificial='yes'/>
+            <parameter type-id='type-id-495' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -14557,7 +14557,7 @@
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='getSize' mangled-name='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE7getSizeEv' filepath='src/mongo/bson/util/builder.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11_BufBuilderINS_16TrivialAllocatorEE7getSizeEv'>
-            <parameter type-id='type-id-506' is-artificial='yes'/>
+            <parameter type-id='type-id-495' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
@@ -14571,7 +14571,7 @@
         <member-function access='public'>
           <function-decl name='appendStr' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendStrENS_10StringDataEb' filepath='src/mongo/bson/util/builder.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE9appendStrENS_10StringDataEb'>
             <parameter type-id='type-id-1395' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-481'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -14688,23 +14688,23 @@
         <enumerator name='TenGen' value='1'/>
         <enumerator name='JS' value='2'/>
       </enum-decl>
-      <class-decl name='BSONArray' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='614' column='1' id='type-id-1322'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-369'/>
+      <class-decl name='BSONArray' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='614' column='1' id='type-id-1311'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-358'/>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONArray' filepath='src/mongo/bson/bsonobj.h' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1323' is-artificial='yes'/>
+            <parameter type-id='type-id-1312' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONArray' filepath='src/mongo/bson/bsonobj.h' line='617' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1323' is-artificial='yes'/>
-            <parameter type-id='type-id-371'/>
+            <parameter type-id='type-id-1312' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONBinData' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='179' column='1' id='type-id-353'>
+      <class-decl name='BSONBinData' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='179' column='1' id='type-id-342'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='data' type-id='type-id-45' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='181' column='1'/>
         </data-member>
@@ -14716,7 +14716,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONBinData' filepath='src/mongo/bson/bsonmisc.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1324' is-artificial='yes'/>
+            <parameter type-id='type-id-1313' is-artificial='yes'/>
             <parameter type-id='type-id-45'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-2824'/>
@@ -14724,74 +14724,74 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONCode' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='159' column='1' id='type-id-356'>
+      <class-decl name='BSONCode' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='159' column='1' id='type-id-345'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='code' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='161' column='1'/>
+          <var-decl name='code' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='161' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONCode' filepath='src/mongo/bson/bsonmisc.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1325' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1314' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONCodeWScope' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='165' column='1' id='type-id-359'>
+      <class-decl name='BSONCodeWScope' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='165' column='1' id='type-id-348'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='code' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='167' column='1'/>
+          <var-decl name='code' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='167' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='scope' type-id='type-id-369' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='168' column='1'/>
+          <var-decl name='scope' type-id='type-id-358' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='168' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONCodeWScope' filepath='src/mongo/bson/bsonmisc.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1326' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-371'/>
+            <parameter type-id='type-id-1315' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-360'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONDBRef' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='187' column='1' id='type-id-362'>
+      <class-decl name='BSONDBRef' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='187' column='1' id='type-id-351'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='ns' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='189' column='1'/>
+          <var-decl name='ns' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='189' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='oid' type-id='type-id-463' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='190' column='1'/>
+          <var-decl name='oid' type-id='type-id-452' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='190' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONDBRef' filepath='src/mongo/bson/bsonmisc.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1327' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-465'/>
+            <parameter type-id='type-id-1316' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-454'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONRegEx' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='172' column='1' id='type-id-387'>
+      <class-decl name='BSONRegEx' size-in-bits='256' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='172' column='1' id='type-id-376'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='pattern' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='174' column='1'/>
+          <var-decl name='pattern' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='174' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='flags' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='175' column='1'/>
+          <var-decl name='flags' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='175' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONRegEx' filepath='src/mongo/bson/bsonmisc.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1342' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1331' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONSymbol' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='153' column='1' id='type-id-394'>
+      <class-decl name='BSONSymbol' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='153' column='1' id='type-id-383'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='symbol' type-id='type-id-492' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='155' column='1'/>
+          <var-decl name='symbol' type-id='type-id-481' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='155' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONSymbol' filepath='src/mongo/bson/bsonmisc.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1344' is-artificial='yes'/>
-            <parameter type-id='type-id-492'/>
+            <parameter type-id='type-id-1333' is-artificial='yes'/>
+            <parameter type-id='type-id-481'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -14801,7 +14801,7 @@
           <class-decl name='Handler&lt;char, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type.h' line='57' column='1' id='type-id-2828'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm' filepath='src/mongo/base/data_type.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm'>
-                <parameter type-id='type-id-333'/>
+                <parameter type-id='type-id-322'/>
                 <parameter type-id='type-id-39'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14818,7 +14818,7 @@
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm' filepath='src/mongo/base/data_type.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm'>
-                <parameter type-id='type-id-341'/>
+                <parameter type-id='type-id-330'/>
                 <parameter type-id='type-id-39'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14826,7 +14826,7 @@
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm'>
-                <parameter type-id='type-id-1315'/>
+                <parameter type-id='type-id-1304'/>
                 <parameter type-id='type-id-59'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14838,7 +14838,7 @@
           <class-decl name='Handler&lt;mongo::LittleEndian&lt;char&gt;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='120' column='1' id='type-id-2830'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIcEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_12LittleEndianIcEEvE11unsafeStoreERKS3_PcPm'>
-                <parameter type-id='type-id-448'/>
+                <parameter type-id='type-id-437'/>
                 <parameter type-id='type-id-39'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14850,12 +14850,12 @@
           <class-decl name='Handler&lt;mongo::LittleEndian&lt;int&gt;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='120' column='1' id='type-id-2831'>
             <member-function access='public' static='yes'>
               <function-decl name='defaultConstruct' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE16defaultConstructEv' filepath='src/mongo/base/data_type_endian.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE16defaultConstructEv'>
-                <return type-id='type-id-450'/>
+                <return type-id='type-id-439'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE11unsafeStoreERKS3_PcPm'>
-                <parameter type-id='type-id-452'/>
+                <parameter type-id='type-id-441'/>
                 <parameter type-id='type-id-39'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14863,7 +14863,7 @@
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_12LittleEndianIiEEvE10unsafeLoadEPS3_PKcPm'>
-                <parameter type-id='type-id-1369'/>
+                <parameter type-id='type-id-1358'/>
                 <parameter type-id='type-id-59'/>
                 <parameter type-id='type-id-1446'/>
                 <return type-id='type-id-65'/>
@@ -14873,12 +14873,12 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='defaultConstruct&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataType16defaultConstructINS_12LittleEndianIiEEEET_v' filepath='src/mongo/base/data_type.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType16defaultConstructINS_12LittleEndianIiEEEET_v'>
-            <return type-id='type-id-450'/>
+            <return type-id='type-id-439'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIiEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIiEEEEvRKT_PcPm'>
-            <parameter type-id='type-id-452'/>
+            <parameter type-id='type-id-441'/>
             <parameter type-id='type-id-39'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
@@ -14886,7 +14886,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIiEEEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIiEEEEvPT_PKcPm'>
-            <parameter type-id='type-id-1369'/>
+            <parameter type-id='type-id-1358'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
@@ -14899,7 +14899,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;char&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIcEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIcEEEEvRKT_PcPm'>
-            <parameter type-id='type-id-448'/>
+            <parameter type-id='type-id-437'/>
             <parameter type-id='type-id-39'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
@@ -14907,7 +14907,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;int&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIiEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType11unsafeStoreIiEEvRKT_PcPm'>
-            <parameter type-id='type-id-341'/>
+            <parameter type-id='type-id-330'/>
             <parameter type-id='type-id-39'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
@@ -14915,7 +14915,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm'>
-            <parameter type-id='type-id-1315'/>
+            <parameter type-id='type-id-1304'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
@@ -14923,30 +14923,30 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='unsafeStore&lt;char&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIcEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType11unsafeStoreIcEEvRKT_PcPm'>
-            <parameter type-id='type-id-333'/>
+            <parameter type-id='type-id-322'/>
             <parameter type-id='type-id-39'/>
             <parameter type-id='type-id-1446'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='DateNowLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='103' column='1' id='type-id-408'/>
-      <class-decl name='ExceptionInfo' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/util/assert_util.h' line='76' column='1' id='type-id-420'>
+      <class-decl name='DateNowLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='103' column='1' id='type-id-397'/>
+      <class-decl name='ExceptionInfo' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/util/assert_util.h' line='76' column='1' id='type-id-409'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='msg' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/assert_util.h' line='89' column='1'/>
+          <var-decl name='msg' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/assert_util.h' line='89' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <var-decl name='code' type-id='type-id-23' visibility='default' filepath='src/mongo/util/assert_util.h' line='90' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExceptionInfo' filepath='src/mongo/util/assert_util.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExceptionInfo' filepath='src/mongo/util/assert_util.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
             <parameter type-id='type-id-59'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
@@ -14954,121 +14954,121 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExceptionInfo' filepath='src/mongo/util/assert_util.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ExceptionInfo' mangled-name='_ZN5mongo13ExceptionInfoC2ERKSsi' filepath='src/mongo/util/assert_util.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo13ExceptionInfoC2ERKSsi'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1345' is-artificial='yes'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='GENOIDLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='96' column='1' id='type-id-2832'/>
-      <class-decl name='LittleEndian&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='56' column='1' id='type-id-446'>
+      <class-decl name='LittleEndian&lt;char&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='56' column='1' id='type-id-435'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='value' type-id='type-id-5' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='59' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='LittleEndian' filepath='src/mongo/base/data_type_endian.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='LittleEndian' filepath='src/mongo/base/data_type_endian.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='LittleEndian' mangled-name='_ZN5mongo12LittleEndianIcEC2Ec' filepath='src/mongo/base/data_type_endian.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12LittleEndianIcEC2Ec'>
-            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1357' is-artificial='yes'/>
             <parameter type-id='type-id-5'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='LittleEndian&lt;int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='56' column='1' id='type-id-450'>
+      <class-decl name='LittleEndian&lt;int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='56' column='1' id='type-id-439'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='value' type-id='type-id-23' visibility='default' filepath='src/mongo/base/data_type_endian.h' line='59' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='LittleEndian' filepath='src/mongo/base/data_type_endian.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='LittleEndian' filepath='src/mongo/base/data_type_endian.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator int' mangled-name='_ZNK5mongo12LittleEndianIiEcviEv' filepath='src/mongo/base/data_type_endian.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo12LittleEndianIiEcviEv'>
-            <parameter type-id='type-id-453' is-artificial='yes'/>
+            <parameter type-id='type-id-442' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='LittleEndian' mangled-name='_ZN5mongo12LittleEndianIiEC2Ei' filepath='src/mongo/base/data_type_endian.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12LittleEndianIiEC2Ei'>
-            <parameter type-id='type-id-1369' is-artificial='yes'/>
+            <parameter type-id='type-id-1358' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='MaxKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='126' column='1' id='type-id-454'/>
-      <class-decl name='MinKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='124' column='1' id='type-id-457'/>
-      <class-decl name='NullLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='110' column='1' id='type-id-460'/>
-      <class-decl name='SASLGlobalParams' size-in-bits='448' is-struct='yes' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='45' column='1' id='type-id-1373'>
+      <class-decl name='MaxKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='126' column='1' id='type-id-443'/>
+      <class-decl name='MinKeyLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='124' column='1' id='type-id-446'/>
+      <class-decl name='NullLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='110' column='1' id='type-id-449'/>
+      <class-decl name='SASLGlobalParams' size-in-bits='448' is-struct='yes' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='45' column='1' id='type-id-1362'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='authenticationMechanisms' type-id='type-id-1276' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='46' column='1'/>
+          <var-decl name='authenticationMechanisms' type-id='type-id-1265' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='46' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='hostName' type-id='type-id-1204' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='47' column='1'/>
+          <var-decl name='hostName' type-id='type-id-1193' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='47' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='serviceName' type-id='type-id-1204' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='48' column='1'/>
+          <var-decl name='serviceName' type-id='type-id-1193' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='48' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
-          <var-decl name='authdPath' type-id='type-id-1204' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='49' column='1'/>
+          <var-decl name='authdPath' type-id='type-id-1193' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='49' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
           <var-decl name='scramIterationCount' type-id='type-id-23' visibility='default' filepath='src/mongo/db/auth/sasl_options.h' line='50' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SASLGlobalParams' filepath='src/mongo/db/auth/sasl_options.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
+            <parameter type-id='type-id-1363' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SASLGlobalParams' mangled-name='_ZN5mongo16SASLGlobalParamsC2Ev' filepath='src/mongo/db/auth/sasl_options.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16SASLGlobalParamsC2Ev'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
+            <parameter type-id='type-id-1363' is-artificial='yes'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='UndefinedLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='117' column='1' id='type-id-500'/>
-      <typedef-decl name='AtomicUInt32' type-id='type-id-350' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-2821'/>
-      <typedef-decl name='BufBuilder' type-id='type-id-503' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1345'/>
+      <class-decl name='UndefinedLabeler' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonmisc.h' line='117' column='1' id='type-id-489'/>
+      <typedef-decl name='AtomicUInt32' type-id='type-id-339' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-2821'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-492' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1334'/>
       <typedef-decl name='Milliseconds' type-id='type-id-2664' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-2833'/>
       <typedef-decl name='Seconds' type-id='type-id-2665' filepath='src/mongo/util/time_support.h' line='48' column='1' id='type-id-2822'/>
-      <typedef-decl name='StringBuilder' type-id='type-id-488' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1386'/>
+      <typedef-decl name='StringBuilder' type-id='type-id-477' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1386'/>
       <class-decl name='DBException' visibility='default' is-declaration-only='yes' id='type-id-1949'>
         <member-function access='public' constructor='yes'>
           <function-decl name='DBException' filepath='src/mongo/util/assert_util.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2000' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -15076,7 +15076,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='DBException' mangled-name='_ZN5mongo11DBExceptionC2ERKSsi' filepath='src/mongo/util/assert_util.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11DBExceptionC2ERKSsi'>
             <parameter type-id='type-id-2000' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -15124,7 +15124,7 @@
         <member-function access='public' vtable-offset='5'>
           <function-decl name='addContext' mangled-name='_ZN5mongo11DBException10addContextERKSs' filepath='src/mongo/util/assert_util.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11DBException10addContextERKSs'>
             <parameter type-id='type-id-2000' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -15134,7 +15134,7 @@
           <function-decl name='MsgAssertionException' filepath='src/mongo/util/assert_util.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2002' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -15142,7 +15142,7 @@
           <function-decl name='MsgAssertionException' mangled-name='_ZN5mongo21MsgAssertionExceptionC2EiRKSs' filepath='src/mongo/util/assert_util.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21MsgAssertionExceptionC2EiRKSs'>
             <parameter type-id='type-id-2002' is-artificial='yes'/>
             <parameter type-id='type-id-23'/>
-            <parameter type-id='type-id-1206'/>
+            <parameter type-id='type-id-1195'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -15152,36 +15152,36 @@
       <class-decl name='ServerParameter' visibility='default' is-declaration-only='yes' id='type-id-2007'/>
       <function-decl name='tagLittleEndian&lt;char&gt;' mangled-name='_ZN5mongo15tagLittleEndianIcEENS_12LittleEndianIT_EES2_' filepath='src/mongo/base/data_type_endian.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15tagLittleEndianIcEENS_12LittleEndianIT_EES2_'>
         <parameter type-id='type-id-5' name='t' filepath='src/mongo/base/data_type_endian.h' line='67' column='1'/>
-        <return type-id='type-id-446'/>
+        <return type-id='type-id-435'/>
       </function-decl>
       <function-decl name='tagLittleEndian&lt;int&gt;' mangled-name='_ZN5mongo15tagLittleEndianIiEENS_12LittleEndianIT_EES2_' filepath='src/mongo/base/data_type_endian.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15tagLittleEndianIiEENS_12LittleEndianIT_EES2_'>
         <parameter type-id='type-id-23' name='t' filepath='src/mongo/base/data_type_endian.h' line='67' column='1'/>
-        <return type-id='type-id-450'/>
+        <return type-id='type-id-439'/>
       </function-decl>
       <typedef-decl name='BSONElementSet' type-id='type-id-2633' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-1998'/>
       <typedef-decl name='BSONElementMSet' type-id='type-id-2632' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-1996'/>
-      <var-decl name='saslGlobalParams' type-id='type-id-1373' mangled-name='_ZN5mongo16saslGlobalParamsE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='42' column='1' elf-symbol-id='_ZN5mongo16saslGlobalParamsE'/>
+      <var-decl name='saslGlobalParams' type-id='type-id-1362' mangled-name='_ZN5mongo16saslGlobalParamsE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='42' column='1' elf-symbol-id='_ZN5mongo16saslGlobalParamsE'/>
       <function-decl name='addSASLOptions' mangled-name='_ZN5mongo14addSASLOptionsEPNS_17optionenvironment13OptionSectionE' filepath='src/mongo/db/auth/sasl_options.cpp' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14addSASLOptionsEPNS_17optionenvironment13OptionSectionE'>
         <parameter type-id='type-id-1437' name='options' filepath='src/mongo/db/auth/sasl_options.cpp' line='56' column='1'/>
-        <return type-id='type-id-484'/>
+        <return type-id='type-id-473'/>
       </function-decl>
       <function-decl name='storeSASLOptions' mangled-name='_ZN5mongo16storeSASLOptionsERKNS_17optionenvironment11EnvironmentE' filepath='src/mongo/db/auth/sasl_options.cpp' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16storeSASLOptionsERKNS_17optionenvironment11EnvironmentE'>
-        <parameter type-id='type-id-540' name='params' filepath='src/mongo/db/auth/sasl_options.cpp' line='91' column='1'/>
-        <return type-id='type-id-484'/>
+        <parameter type-id='type-id-529' name='params' filepath='src/mongo/db/auth/sasl_options.cpp' line='91' column='1'/>
+        <return type-id='type-id-473'/>
       </function-decl>
       <function-decl name='_mongoInitializerFunction_SASLOptions_Register' mangled-name='_ZN5mongo46_mongoInitializerFunction_SASLOptions_RegisterEPNS_18InitializerContextE' filepath='src/mongo/db/auth/sasl_options.cpp' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo46_mongoInitializerFunction_SASLOptions_RegisterEPNS_18InitializerContextE'>
-        <parameter type-id='type-id-1363' name='context' filepath='src/mongo/db/auth/sasl_options.cpp' line='141' column='1'/>
-        <return type-id='type-id-484'/>
+        <parameter type-id='type-id-1352' name='context' filepath='src/mongo/db/auth/sasl_options.cpp' line='141' column='1'/>
+        <return type-id='type-id-473'/>
       </function-decl>
       <function-decl name='_mongoInitializerFunction_SASLOptions_Store' mangled-name='_ZN5mongo43_mongoInitializerFunction_SASLOptions_StoreEPNS_18InitializerContextE' filepath='src/mongo/db/auth/sasl_options.cpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo43_mongoInitializerFunction_SASLOptions_StoreEPNS_18InitializerContextE'>
-        <parameter type-id='type-id-1363' name='context' filepath='src/mongo/db/auth/sasl_options.cpp' line='145' column='1'/>
-        <return type-id='type-id-484'/>
+        <parameter type-id='type-id-1352' name='context' filepath='src/mongo/db/auth/sasl_options.cpp' line='145' column='1'/>
+        <return type-id='type-id-473'/>
       </function-decl>
-      <var-decl name='SASLAuthenticationMechanismsSetting' type-id='type-id-430' mangled-name='_ZN5mongo35SASLAuthenticationMechanismsSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='151' column='1' elf-symbol-id='_ZN5mongo35SASLAuthenticationMechanismsSettingE'/>
-      <var-decl name='SASLHostNameSetting' type-id='type-id-427' mangled-name='_ZN5mongo19SASLHostNameSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='158' column='1' elf-symbol-id='_ZN5mongo19SASLHostNameSettingE'/>
-      <var-decl name='SASLServiceNameSetting' type-id='type-id-427' mangled-name='_ZN5mongo22SASLServiceNameSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='164' column='1' elf-symbol-id='_ZN5mongo22SASLServiceNameSettingE'/>
-      <var-decl name='SASLAuthdPathSetting' type-id='type-id-427' mangled-name='_ZN5mongo20SASLAuthdPathSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='170' column='1' elf-symbol-id='_ZN5mongo20SASLAuthdPathSettingE'/>
-      <var-decl name='scramIterationCountParam' type-id='type-id-1357' mangled-name='_ZN5mongo24scramIterationCountParamE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='196' column='1' elf-symbol-id='_ZN5mongo24scramIterationCountParamE'/>
+      <var-decl name='SASLAuthenticationMechanismsSetting' type-id='type-id-419' mangled-name='_ZN5mongo35SASLAuthenticationMechanismsSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='151' column='1' elf-symbol-id='_ZN5mongo35SASLAuthenticationMechanismsSettingE'/>
+      <var-decl name='SASLHostNameSetting' type-id='type-id-416' mangled-name='_ZN5mongo19SASLHostNameSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='158' column='1' elf-symbol-id='_ZN5mongo19SASLHostNameSettingE'/>
+      <var-decl name='SASLServiceNameSetting' type-id='type-id-416' mangled-name='_ZN5mongo22SASLServiceNameSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='164' column='1' elf-symbol-id='_ZN5mongo22SASLServiceNameSettingE'/>
+      <var-decl name='SASLAuthdPathSetting' type-id='type-id-416' mangled-name='_ZN5mongo20SASLAuthdPathSettingE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='170' column='1' elf-symbol-id='_ZN5mongo20SASLAuthdPathSettingE'/>
+      <var-decl name='scramIterationCountParam' type-id='type-id-1346' mangled-name='_ZN5mongo24scramIterationCountParamE' visibility='default' filepath='src/mongo/db/auth/sasl_options.cpp' line='196' column='1' elf-symbol-id='_ZN5mongo24scramIterationCountParamE'/>
       <namespace-decl name='optionenvironment'>
         <class-decl name='Constraint' size-in-bits='64' visibility='default' filepath='src/mongo/util/options_parser/constraints.h' line='44' column='1' id='type-id-1418'>
           <member-function access='public' destructor='yes' vtable-offset='-1'>
@@ -15194,23 +15194,23 @@
           <member-function access='private' vtable-offset='2'>
             <function-decl name='check' mangled-name='_ZN5mongo17optionenvironment10Constraint5checkERKNS0_11EnvironmentE' filepath='src/mongo/util/options_parser/constraints.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1420' is-artificial='yes'/>
-              <parameter type-id='type-id-540'/>
-              <return type-id='type-id-484'/>
+              <parameter type-id='type-id-529'/>
+              <return type-id='type-id-473'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='Environment' size-in-bits='1216' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='109' column='1' id='type-id-538'>
+        <class-decl name='Environment' size-in-bits='1216' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='109' column='1' id='type-id-527'>
           <data-member access='protected' layout-offset-in-bits='0'>
-            <var-decl name='constraints' type-id='type-id-1262' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='218' column='1'/>
+            <var-decl name='constraints' type-id='type-id-1251' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='218' column='1'/>
           </data-member>
           <data-member access='protected' layout-offset-in-bits='192'>
-            <var-decl name='keyConstraints' type-id='type-id-1269' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='219' column='1'/>
+            <var-decl name='keyConstraints' type-id='type-id-1258' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='219' column='1'/>
           </data-member>
           <data-member access='protected' layout-offset-in-bits='384'>
-            <var-decl name='values' type-id='type-id-1150' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='220' column='1'/>
+            <var-decl name='values' type-id='type-id-1139' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='220' column='1'/>
           </data-member>
           <data-member access='protected' layout-offset-in-bits='768'>
-            <var-decl name='default_values' type-id='type-id-1150' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='221' column='1'/>
+            <var-decl name='default_values' type-id='type-id-1139' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='221' column='1'/>
           </data-member>
           <data-member access='protected' layout-offset-in-bits='1152'>
             <var-decl name='valid' type-id='type-id-1' visibility='default' filepath='src/mongo/util/options_parser/environment.h' line='222' column='1'/>
@@ -15232,12 +15232,12 @@
         <class-decl name='KeyConstraint' size-in-bits='128' visibility='default' filepath='src/mongo/util/options_parser/constraints.h' line='61' column='1' id='type-id-1427'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1418'/>
           <data-member access='protected' layout-offset-in-bits='64'>
-            <var-decl name='_key' type-id='type-id-542' visibility='default' filepath='src/mongo/util/options_parser/constraints.h' line='67' column='1'/>
+            <var-decl name='_key' type-id='type-id-531' visibility='default' filepath='src/mongo/util/options_parser/constraints.h' line='67' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='KeyConstraint' filepath='src/mongo/util/options_parser/constraints.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1428' is-artificial='yes'/>
-              <parameter type-id='type-id-544'/>
+              <parameter type-id='type-id-533'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15249,27 +15249,27 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='OptionDescription' size-in-bits='2368' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='75' column='1' id='type-id-545'>
+        <class-decl name='OptionDescription' size-in-bits='2368' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='75' column='1' id='type-id-534'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='_dottedName' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='207' column='1'/>
+            <var-decl name='_dottedName' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='207' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='_singleName' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='208' column='1'/>
+            <var-decl name='_singleName' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='208' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <var-decl name='_type' type-id='type-id-2834' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='209' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='_description' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='211' column='1'/>
+            <var-decl name='_description' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='211' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
             <var-decl name='_isVisible' type-id='type-id-1' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='212' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='_default' type-id='type-id-553' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='213' column='1'/>
+            <var-decl name='_default' type-id='type-id-542' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='213' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='1088'>
-            <var-decl name='_implicit' type-id='type-id-553' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='214' column='1'/>
+            <var-decl name='_implicit' type-id='type-id-542' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='214' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='1856'>
             <var-decl name='_isComposing' type-id='type-id-1' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='215' column='1'/>
@@ -15284,47 +15284,47 @@
             <var-decl name='_positionalEnd' type-id='type-id-23' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='219' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='1984'>
-            <var-decl name='_constraints' type-id='type-id-1285' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='228' column='1'/>
+            <var-decl name='_constraints' type-id='type-id-1274' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='228' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='2176'>
-            <var-decl name='_deprecatedDottedNames' type-id='type-id-1276' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='232' column='1'/>
+            <var-decl name='_deprecatedDottedNames' type-id='type-id-1265' visibility='default' filepath='src/mongo/util/options_parser/option_description.h' line='232' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='OptionDescription' filepath='src/mongo/util/options_parser/option_description.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1435' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
+              <parameter type-id='type-id-1195'/>
               <parameter type-id='type-id-2834'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='OptionDescription' filepath='src/mongo/util/options_parser/option_description.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1435' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
+              <parameter type-id='type-id-1195'/>
               <parameter type-id='type-id-2834'/>
-              <parameter type-id='type-id-1206'/>
-              <parameter type-id='type-id-1278'/>
+              <parameter type-id='type-id-1195'/>
+              <parameter type-id='type-id-1267'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='OptionSection' size-in-bits='320' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='77' column='1' id='type-id-549'>
+        <class-decl name='OptionSection' size-in-bits='320' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='77' column='1' id='type-id-538'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_name' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='166' column='1'/>
+            <var-decl name='_name' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='166' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_subSections' type-id='type-id-1136' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='167' column='1'/>
+            <var-decl name='_subSections' type-id='type-id-1125' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='167' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='_options' type-id='type-id-1126' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='168' column='1'/>
+            <var-decl name='_options' type-id='type-id-1115' visibility='default' filepath='src/mongo/util/options_parser/option_section.h' line='168' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='OptionSection' filepath='src/mongo/util/options_parser/option_section.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1437' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15337,12 +15337,12 @@
           <member-function access='public' constructor='yes'>
             <function-decl name='OptionSection' mangled-name='_ZN5mongo17optionenvironment13OptionSectionC2ERKSs' filepath='src/mongo/util/options_parser/option_section.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17optionenvironment13OptionSectionC2ERKSs'>
               <parameter type-id='type-id-1437' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='Value' size-in-bits='768' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='66' column='1' id='type-id-553'>
+        <class-decl name='Value' size-in-bits='768' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='66' column='1' id='type-id-542'>
           <member-type access='private'>
             <enum-decl name='Type' filepath='src/mongo/util/options_parser/value.h' line='150' column='1' id='type-id-2836'>
               <underlying-type type-id='type-id-88'/>
@@ -15387,7 +15387,7 @@
             <var-decl name='_stringMapVal' type-id='type-id-1438' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='138' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='576'>
-            <var-decl name='_stringVal' type-id='type-id-1204' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='139' column='1'/>
+            <var-decl name='_stringVal' type-id='type-id-1193' visibility='default' filepath='src/mongo/util/options_parser/value.h' line='139' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='640'>
             <var-decl name='' type-id='type-id-2837' visibility='default'/>
@@ -15446,7 +15446,7 @@
           <member-function access='public' constructor='yes'>
             <function-decl name='Value' filepath='src/mongo/util/options_parser/value.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1442' is-artificial='yes'/>
-              <parameter type-id='type-id-1204'/>
+              <parameter type-id='type-id-1193'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15473,25 +15473,25 @@
           </member-function>
           <member-function access='public' const='yes'>
             <function-decl name='as&lt;std::map&lt;std::basic_string&lt;char&gt;, std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZNK5mongo17optionenvironment5Value2asISt3mapISsSsSt4lessISsESaISt4pairIKSsSsEEEEET_v' filepath='src/mongo/util/options_parser/value.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asISt3mapISsSsSt4lessISsESaISt4pairIKSsSsEEEEET_v'>
-              <parameter type-id='type-id-556' is-artificial='yes'/>
-              <return type-id='type-id-1157'/>
+              <parameter type-id='type-id-545' is-artificial='yes'/>
+              <return type-id='type-id-1146'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes'>
             <function-decl name='as&lt;std::vector&lt;std::basic_string&lt;char&gt; &gt; &gt;' mangled-name='_ZNK5mongo17optionenvironment5Value2asISt6vectorISsSaISsEEEET_v' filepath='src/mongo/util/options_parser/value.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asISt6vectorISsSaISsEEEET_v'>
-              <parameter type-id='type-id-556' is-artificial='yes'/>
-              <return type-id='type-id-1276'/>
+              <parameter type-id='type-id-545' is-artificial='yes'/>
+              <return type-id='type-id-1265'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes'>
             <function-decl name='as&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZNK5mongo17optionenvironment5Value2asISsEET_v' filepath='src/mongo/util/options_parser/value.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asISsEET_v'>
-              <parameter type-id='type-id-556' is-artificial='yes'/>
+              <parameter type-id='type-id-545' is-artificial='yes'/>
               <return type-id='type-id-31'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes'>
             <function-decl name='as&lt;int&gt;' mangled-name='_ZNK5mongo17optionenvironment5Value2asIiEET_v' filepath='src/mongo/util/options_parser/value.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17optionenvironment5Value2asIiEET_v'>
-              <parameter type-id='type-id-556' is-artificial='yes'/>
+              <parameter type-id='type-id-545' is-artificial='yes'/>
               <return type-id='type-id-23'/>
             </function-decl>
           </member-function>
@@ -15518,20 +15518,20 @@
           <enumerator name='Unsigned' value='8'/>
           <enumerator name='Switch' value='9'/>
         </enum-decl>
-        <typedef-decl name='Key' type-id='type-id-1204' filepath='src/mongo/util/options_parser/environment.h' line='43' column='1' id='type-id-542'/>
-        <typedef-decl name='StringMap_t' type-id='type-id-1157' filepath='src/mongo/util/options_parser/value.h' line='45' column='1' id='type-id-1438'/>
-        <typedef-decl name='StringVector_t' type-id='type-id-1276' filepath='src/mongo/util/options_parser/value.h' line='46' column='1' id='type-id-1440'/>
+        <typedef-decl name='Key' type-id='type-id-1193' filepath='src/mongo/util/options_parser/environment.h' line='43' column='1' id='type-id-531'/>
+        <typedef-decl name='StringMap_t' type-id='type-id-1146' filepath='src/mongo/util/options_parser/value.h' line='45' column='1' id='type-id-1438'/>
+        <typedef-decl name='StringVector_t' type-id='type-id-1265' filepath='src/mongo/util/options_parser/value.h' line='46' column='1' id='type-id-1440'/>
       </namespace-decl>
       <namespace-decl name='logger'>
-        <class-decl name='ComponentMessageLogDomain' size-in-bits='448' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='39' column='1' id='type-id-507'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-522'/>
+        <class-decl name='ComponentMessageLogDomain' size-in-bits='448' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='39' column='1' id='type-id-496'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-511'/>
           <data-member access='private' layout-offset-in-bits='200'>
-            <var-decl name='_settings' type-id='type-id-518' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='83' column='1'/>
+            <var-decl name='_settings' type-id='type-id-507' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='83' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1397' is-artificial='yes'/>
-              <parameter type-id='type-id-509'/>
+              <parameter type-id='type-id-498'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15549,9 +15549,9 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LabeledLevel' size-in-bits='128' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='40' column='1' id='type-id-511'>
+        <class-decl name='LabeledLevel' size-in-bits='128' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='40' column='1' id='type-id-500'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_label' type-id='type-id-1204' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='66' column='1'/>
+            <var-decl name='_label' type-id='type-id-1193' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='66' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
             <var-decl name='_level' type-id='type-id-23' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='67' column='1'/>
@@ -15574,13 +15574,13 @@
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1398' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <parameter type-id='type-id-23'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-515'>
+        <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-504'>
           <member-type access='public'>
             <enum-decl name='Value' filepath='src/mongo/logger/log_component.h' line='45' column='1' id='type-id-2838'>
               <underlying-type type-id='type-id-88'/>
@@ -15619,7 +15619,7 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogComponentSettings' size-in-bits='224' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='42' column='1' id='type-id-518'>
+        <class-decl name='LogComponentSettings' size-in-bits='224' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='42' column='1' id='type-id-507'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_hasMinimumLoggedSeverity' type-id='type-id-2' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='87' column='1'/>
           </data-member>
@@ -15629,7 +15629,7 @@
           <member-function access='private' constructor='yes'>
             <function-decl name='LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1401' is-artificial='yes'/>
-              <parameter type-id='type-id-520'/>
+              <parameter type-id='type-id-509'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15647,12 +15647,12 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-522'>
+        <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-511'>
           <member-type access='private'>
-            <typedef-decl name='AppenderVector' type-id='type-id-1258' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-2839'/>
+            <typedef-decl name='AppenderVector' type-id='type-id-1247' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-2839'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='Event' type-id='type-id-535' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-526'/>
+            <typedef-decl name='Event' type-id='type-id-524' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-515'/>
           </member-type>
           <member-type access='private'>
             <class-decl name='AppenderHandle' visibility='default' is-declaration-only='yes' id='type-id-2840'/>
@@ -15669,7 +15669,7 @@
           <member-function access='private'>
             <function-decl name='LogDomain' filepath='src/mongo/logger/log_domain.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1403' is-artificial='yes'/>
-              <parameter type-id='type-id-524'/>
+              <parameter type-id='type-id-513'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15687,20 +15687,20 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-529'>
+        <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-518'>
           <member-type access='private'>
-            <typedef-decl name='DomainsByNameMap' type-id='type-id-1230' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-2842'/>
+            <typedef-decl name='DomainsByNameMap' type-id='type-id-1219' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-2842'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_domains' type-id='type-id-2842' visibility='default' filepath='src/mongo/logger/log_manager.h' line='67' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='_globalDomain' type-id='type-id-507' visibility='default' filepath='src/mongo/logger/log_manager.h' line='68' column='1'/>
+            <var-decl name='_globalDomain' type-id='type-id-496' visibility='default' filepath='src/mongo/logger/log_manager.h' line='68' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogManager' filepath='src/mongo/logger/log_manager.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1407' is-artificial='yes'/>
-              <parameter type-id='type-id-531'/>
+              <parameter type-id='type-id-520'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15724,7 +15724,7 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogSeverity' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_severity.h' line='44' column='1' id='type-id-532'>
+        <class-decl name='LogSeverity' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_severity.h' line='44' column='1' id='type-id-521'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_severity' type-id='type-id-23' visibility='default' filepath='src/mongo/logger/log_severity.h' line='135' column='1'/>
           </data-member>
@@ -15744,7 +15744,7 @@
           </member-function>
           <member-function access='public' static='yes'>
             <function-decl name='Log' mangled-name='_ZN5mongo6logger11LogSeverity3LogEv' filepath='src/mongo/logger/log_severity.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger11LogSeverity3LogEv'>
-              <return type-id='type-id-532'/>
+              <return type-id='type-id-521'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -15753,19 +15753,19 @@
             <var-decl name='_domain' type-id='type-id-1415' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='226' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_contextName' type-id='type-id-1204' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='227' column='1'/>
+            <var-decl name='_contextName' type-id='type-id-1193' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='227' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='_severity' type-id='type-id-532' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='228' column='1'/>
+            <var-decl name='_severity' type-id='type-id-521' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='228' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='160'>
-            <var-decl name='_component' type-id='type-id-515' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='229' column='1'/>
+            <var-decl name='_component' type-id='type-id-504' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='229' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='_baseMessage' type-id='type-id-1204' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='230' column='1'/>
+            <var-decl name='_baseMessage' type-id='type-id-1193' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='230' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='_os' type-id='type-id-1223' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='231' column='1'/>
+            <var-decl name='_os' type-id='type-id-1212' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='231' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
             <var-decl name='_tee' type-id='type-id-1417' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='232' column='1'/>
@@ -15774,8 +15774,8 @@
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1412' is-artificial='yes'/>
               <parameter type-id='type-id-1415'/>
-              <parameter type-id='type-id-1204'/>
-              <parameter type-id='type-id-532'/>
+              <parameter type-id='type-id-1193'/>
+              <parameter type-id='type-id-521'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15783,9 +15783,9 @@
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1412' is-artificial='yes'/>
               <parameter type-id='type-id-1415'/>
-              <parameter type-id='type-id-1204'/>
-              <parameter type-id='type-id-532'/>
-              <parameter type-id='type-id-515'/>
+              <parameter type-id='type-id-1193'/>
+              <parameter type-id='type-id-521'/>
+              <parameter type-id='type-id-504'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15793,8 +15793,8 @@
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1412' is-artificial='yes'/>
               <parameter type-id='type-id-1415'/>
-              <parameter type-id='type-id-1206'/>
-              <parameter type-id='type-id-511'/>
+              <parameter type-id='type-id-1195'/>
+              <parameter type-id='type-id-500'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15828,45 +15828,45 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKSs' filepath='src/mongo/logger/logstream_builder.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsERKSs'>
               <parameter type-id='type-id-1412' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <return type-id='type-id-1410'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='MessageEventEphemeral' size-in-bits='384' visibility='default' filepath='src/mongo/logger/message_event.h' line='46' column='1' id='type-id-535'>
+        <class-decl name='MessageEventEphemeral' size-in-bits='384' visibility='default' filepath='src/mongo/logger/message_event.h' line='46' column='1' id='type-id-524'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_date' type-id='type-id-411' visibility='default' filepath='src/mongo/logger/message_event.h' line='86' column='1'/>
+            <var-decl name='_date' type-id='type-id-400' visibility='default' filepath='src/mongo/logger/message_event.h' line='86' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_severity' type-id='type-id-532' visibility='default' filepath='src/mongo/logger/message_event.h' line='87' column='1'/>
+            <var-decl name='_severity' type-id='type-id-521' visibility='default' filepath='src/mongo/logger/message_event.h' line='87' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='96'>
-            <var-decl name='_component' type-id='type-id-515' visibility='default' filepath='src/mongo/logger/message_event.h' line='88' column='1'/>
+            <var-decl name='_component' type-id='type-id-504' visibility='default' filepath='src/mongo/logger/message_event.h' line='88' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='_contextName' type-id='type-id-492' visibility='default' filepath='src/mongo/logger/message_event.h' line='89' column='1'/>
+            <var-decl name='_contextName' type-id='type-id-481' visibility='default' filepath='src/mongo/logger/message_event.h' line='89' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='_message' type-id='type-id-492' visibility='default' filepath='src/mongo/logger/message_event.h' line='90' column='1'/>
+            <var-decl name='_message' type-id='type-id-481' visibility='default' filepath='src/mongo/logger/message_event.h' line='90' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='MessageEventEphemeral' filepath='src/mongo/logger/message_event.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1413' is-artificial='yes'/>
-              <parameter type-id='type-id-411'/>
-              <parameter type-id='type-id-532'/>
-              <parameter type-id='type-id-492'/>
-              <parameter type-id='type-id-492'/>
+              <parameter type-id='type-id-400'/>
+              <parameter type-id='type-id-521'/>
+              <parameter type-id='type-id-481'/>
+              <parameter type-id='type-id-481'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='MessageEventEphemeral' filepath='src/mongo/logger/message_event.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1413' is-artificial='yes'/>
-              <parameter type-id='type-id-411'/>
-              <parameter type-id='type-id-532'/>
-              <parameter type-id='type-id-515'/>
-              <parameter type-id='type-id-492'/>
-              <parameter type-id='type-id-492'/>
+              <parameter type-id='type-id-400'/>
+              <parameter type-id='type-id-521'/>
+              <parameter type-id='type-id-504'/>
+              <parameter type-id='type-id-481'/>
+              <parameter type-id='type-id-481'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -15882,12 +15882,12 @@
           <member-function access='public' vtable-offset='2'>
             <function-decl name='write' mangled-name='_ZN5mongo6logger3Tee5writeERKSs' filepath='src/mongo/logger/tee.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-1417' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='MessageLogDomain' type-id='type-id-522' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1414'/>
+        <typedef-decl name='MessageLogDomain' type-id='type-id-511' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1414'/>
         <class-decl name='Appender&lt;mongo::logger::MessageEventEphemeral&gt;' visibility='default' is-declaration-only='yes' id='type-id-2009'/>
         <function-decl name='globalLogDomain' mangled-name='_ZN5mongo6logger15globalLogDomainEv' filepath='src/mongo/logger/logger.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger15globalLogDomainEv'>
           <return type-id='type-id-1397'/>
@@ -15936,20 +15936,20 @@
         </function-decl>
       </namespace-decl>
       <function-decl name='intrusive_ptr_release' mangled-name='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE' filepath='src/mongo/util/shared_buffer.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE'>
-        <parameter type-id='type-id-1380' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
+        <parameter type-id='type-id-1369' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
         <return type-id='type-id-65'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='stream' size-in-bits='256' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='56' column='1' id='type-id-557'>
+        <class-decl name='stream' size-in-bits='256' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='56' column='1' id='type-id-546'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='ss' type-id='type-id-1386' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='58' column='1'/>
           </data-member>
           <member-function access='public' const='yes'>
             <function-decl name='operator std::string' mangled-name='_ZNK10mongoutils3str6streamcvSsEv' filepath='src/mongo/util/mongoutils/str.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10mongoutils3str6streamcvSsEv'>
-              <parameter type-id='type-id-559' is-artificial='yes'/>
-              <return type-id='type-id-1204'/>
+              <parameter type-id='type-id-548' is-artificial='yes'/>
+              <return type-id='type-id-1193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
@@ -15962,7 +15962,7 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt; &lt;int&gt;' mangled-name='_ZN10mongoutils3str6streamlsIiEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIiEERS1_RKT_'>
               <parameter type-id='type-id-1444' is-artificial='yes'/>
-              <parameter type-id='type-id-341'/>
+              <parameter type-id='type-id-330'/>
               <return type-id='type-id-1443'/>
             </function-decl>
           </member-function>
@@ -15989,13 +15989,13 @@
             </member-function>
             <member-function access='public' const='yes' vtable-offset='2'>
               <function-decl name='type' mangled-name='_ZNK5boost3any11placeholder4typeEv' filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-321' is-artificial='yes'/>
+                <parameter type-id='type-id-310' is-artificial='yes'/>
                 <return type-id='type-id-1981'/>
               </function-decl>
             </member-function>
             <member-function access='public' const='yes' vtable-offset='3'>
               <function-decl name='clone' mangled-name='_ZNK5boost3any11placeholder5cloneEv' filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-321' is-artificial='yes'/>
+                <parameter type-id='type-id-310' is-artificial='yes'/>
                 <return type-id='type-id-187'/>
               </function-decl>
             </member-function>
@@ -16013,7 +16013,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='any' filepath='src/third_party/boost-1.56.0/boost/any.hpp' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-185' is-artificial='yes'/>
-            <parameter type-id='type-id-318'/>
+            <parameter type-id='type-id-307'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -16034,7 +16034,7 @@
       </class-decl>
       <class-decl name='intrusive_ptr&lt;mongo::SharedBuffer::Holder&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='52' column='1' id='type-id-188'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='px' type-id='type-id-1380' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
+          <var-decl name='px' type-id='type-id-1369' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16045,7 +16045,7 @@
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-191' is-artificial='yes'/>
-            <parameter type-id='type-id-1380'/>
+            <parameter type-id='type-id-1369'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-65'/>
           </function-decl>
@@ -16053,7 +16053,7 @@
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-191' is-artificial='yes'/>
-            <parameter type-id='type-id-323'/>
+            <parameter type-id='type-id-312'/>
             <return type-id='type-id-65'/>
           </function-decl>
         </member-function>
@@ -16090,137 +16090,137 @@
       <namespace-decl name='detail'>
         <class-decl name='integer_traits_base&lt;int, -2147483648, 2147483647&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2847'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-340' mangled-name='_ZN5boost6detail19integer_traits_baseIiLin2147483648ELi2147483647EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-329' mangled-name='_ZN5boost6detail19integer_traits_baseIiLin2147483648ELi2147483647EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-340' mangled-name='_ZN5boost6detail19integer_traits_baseIiLin2147483648ELi2147483647EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-329' mangled-name='_ZN5boost6detail19integer_traits_baseIiLin2147483648ELi2147483647EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;long int, -9223372036854775808l, 9223372036854775807l&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2848'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-343' mangled-name='_ZN5boost6detail19integer_traits_baseIlLln9223372036854775808ELl9223372036854775807EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-332' mangled-name='_ZN5boost6detail19integer_traits_baseIlLln9223372036854775808ELl9223372036854775807EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-343' mangled-name='_ZN5boost6detail19integer_traits_baseIlLln9223372036854775808ELl9223372036854775807EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-332' mangled-name='_ZN5boost6detail19integer_traits_baseIlLln9223372036854775808ELl9223372036854775807EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;long long int, -9223372036854775808ll, 9223372036854775807ll&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2849'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-344' mangled-name='_ZN5boost6detail19integer_traits_baseIxLxn9223372036854775808ELx9223372036854775807EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-333' mangled-name='_ZN5boost6detail19integer_traits_baseIxLxn9223372036854775808ELx9223372036854775807EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-344' mangled-name='_ZN5boost6detail19integer_traits_baseIxLxn9223372036854775808ELx9223372036854775807EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-333' mangled-name='_ZN5boost6detail19integer_traits_baseIxLxn9223372036854775808ELx9223372036854775807EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;long long unsigned int, 0ull, 18446744073709551615ull&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2850'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-1302' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-1291' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-1302' mangled-name='_ZN5boost6detail19integer_traits_baseIyLy0ELy18446744073709551615EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-1291' mangled-name='_ZN5boost6detail19integer_traits_baseIyLy0ELy18446744073709551615EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;long unsigned int, 0ul, 18446744073709551615ul&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2851'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-1299' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-1288' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-1299' mangled-name='_ZN5boost6detail19integer_traits_baseImLm0ELm18446744073709551615EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-1288' mangled-name='_ZN5boost6detail19integer_traits_baseImLm0ELm18446744073709551615EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;short int, -32768, 32767&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2852'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-620' mangled-name='_ZN5boost6detail19integer_traits_baseIsLsn32768ELs32767EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-609' mangled-name='_ZN5boost6detail19integer_traits_baseIsLsn32768ELs32767EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-620' mangled-name='_ZN5boost6detail19integer_traits_baseIsLsn32768ELs32767EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-609' mangled-name='_ZN5boost6detail19integer_traits_baseIsLsn32768ELs32767EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;short unsigned int, 0u, 65535u&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2853'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-1303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-1292' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-1303' mangled-name='_ZN5boost6detail19integer_traits_baseItLt0ELt65535EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-1292' mangled-name='_ZN5boost6detail19integer_traits_baseItLt0ELt65535EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;signed char, -128, 127&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2854'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-621' mangled-name='_ZN5boost6detail19integer_traits_baseIaLan128ELa127EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-610' mangled-name='_ZN5boost6detail19integer_traits_baseIaLan128ELa127EE9const_minE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-621' mangled-name='_ZN5boost6detail19integer_traits_baseIaLan128ELa127EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-610' mangled-name='_ZN5boost6detail19integer_traits_baseIaLan128ELa127EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;unsigned char, 0u, 255u&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2855'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-1296' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-1285' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-1296' mangled-name='_ZN5boost6detail19integer_traits_baseIhLh0ELh255EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-1285' mangled-name='_ZN5boost6detail19integer_traits_baseIhLh0ELh255EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
         <class-decl name='integer_traits_base&lt;unsigned int, 0u, 4294967295u&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='52' column='1' id='type-id-2856'>
           <data-member access='public' static='yes'>
-            <var-decl name='is_integral' type-id='type-id-314' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
+            <var-decl name='is_integral' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='55' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_min' type-id='type-id-1297' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
+            <var-decl name='const_min' type-id='type-id-1286' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='56' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='const_max' type-id='type-id-1297' mangled-name='_ZN5boost6detail19integer_traits_baseIjLj0ELj4294967295EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
+            <var-decl name='const_max' type-id='type-id-1286' mangled-name='_ZN5boost6detail19integer_traits_baseIjLj0ELj4294967295EE9const_maxE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/integer_traits.hpp' line='57' column='1'/>
           </data-member>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='program_options'>
         <class-decl name='options_description' size-in-bits='832' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='173' column='1' id='type-id-192'>
           <data-member access='public' static='yes'>
-            <var-decl name='m_default_line_length' type-id='type-id-1297' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='175' column='1'/>
+            <var-decl name='m_default_line_length' type-id='type-id-1286' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='175' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='m_caption' type-id='type-id-1204' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='245' column='1'/>
+            <var-decl name='m_caption' type-id='type-id-1193' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='245' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='m_line_length' type-id='type-id-1297' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='246' column='1'/>
+            <var-decl name='m_line_length' type-id='type-id-1286' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='246' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='96'>
-            <var-decl name='m_min_description_length' type-id='type-id-1297' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='247' column='1'/>
+            <var-decl name='m_min_description_length' type-id='type-id-1286' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='247' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='m_options' type-id='type-id-1250' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='252' column='1'/>
+            <var-decl name='m_options' type-id='type-id-1239' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='252' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='belong_to_group' type-id='type-id-1246' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='260' column='1'/>
+            <var-decl name='belong_to_group' type-id='type-id-1235' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='260' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='640'>
-            <var-decl name='groups' type-id='type-id-1254' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='263' column='1'/>
+            <var-decl name='groups' type-id='type-id-1243' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='263' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='options_description' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16233,7 +16233,7 @@
           <member-function access='public' constructor='yes'>
             <function-decl name='options_description' filepath='src/third_party/boost-1.56.0/boost/program_options/options_description.hpp' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-194' is-artificial='yes'/>
-              <parameter type-id='type-id-1206'/>
+              <parameter type-id='type-id-1195'/>
               <parameter type-id='type-id-50'/>
               <parameter type-id='type-id-50'/>
               <return type-id='type-id-65'/>
@@ -16254,10 +16254,10 @@
         </class-decl>
         <class-decl name='positional_options_description' size-in-bits='256' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='36' column='1' id='type-id-198'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='m_names' type-id='type-id-1276' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='63' column='1'/>
+            <var-decl name='m_names' type-id='type-id-1265' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='63' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='m_trailing' type-id='type-id-1204' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='64' column='1'/>
+            <var-decl name='m_trailing' type-id='type-id-1193' visibility='default' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='64' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='positional_options_description' filepath='src/third_party/boost-1.56.0/boost/program_options/positional_options.hpp' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16276,54 +16276,54 @@
           </member-function>
           <member-function access='public' const='yes' vtable-offset='0'>
             <function-decl name='name' mangled-name='_ZNK5boost15program_options14value_semantic4nameEv' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
-              <return type-id='type-id-1204'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
+              <return type-id='type-id-1193'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='1'>
             <function-decl name='min_tokens' mangled-name='_ZNK5boost15program_options14value_semantic10min_tokensEv' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <return type-id='type-id-50'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='2'>
             <function-decl name='max_tokens' mangled-name='_ZNK5boost15program_options14value_semantic10max_tokensEv' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <return type-id='type-id-50'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='3'>
             <function-decl name='is_composing' mangled-name='_ZNK5boost15program_options14value_semantic12is_composingEv' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='4'>
             <function-decl name='is_required' mangled-name='_ZNK5boost15program_options14value_semantic11is_requiredEv' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='5'>
             <function-decl name='parse' mangled-name='_ZNK5boost15program_options14value_semantic5parseERNS_3anyERKSt6vectorISsSaISsEEb' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <parameter type-id='type-id-183'/>
-              <parameter type-id='type-id-1278'/>
+              <parameter type-id='type-id-1267'/>
               <parameter type-id='type-id-1'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='6'>
             <function-decl name='apply_default' mangled-name='_ZNK5boost15program_options14value_semantic13apply_defaultERNS_3anyE' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
               <parameter type-id='type-id-183'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='7'>
             <function-decl name='notify' mangled-name='_ZNK5boost15program_options14value_semantic6notifyERKNS_3anyE' filepath='src/third_party/boost-1.56.0/boost/program_options/value_semantic.hpp' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-331' is-artificial='yes'/>
-              <parameter type-id='type-id-318'/>
+              <parameter type-id='type-id-320' is-artificial='yes'/>
+              <parameter type-id='type-id-307'/>
               <return type-id='type-id-65'/>
             </function-decl>
           </member-function>
@@ -16333,110 +16333,110 @@
       <namespace-decl name='type_traits'>
         <class-decl name='ice_eq&lt;8, 16&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/detail/ice_eq.hpp' line='17' column='1' id='type-id-2857'>
           <data-member access='public' static='yes'>
-            <var-decl name='value' type-id='type-id-314' mangled-name='_ZN5boost11type_traits6ice_eqILi8ELi16EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/detail/ice_eq.hpp' line='19' column='1'/>
+            <var-decl name='value' type-id='type-id-303' mangled-name='_ZN5boost11type_traits6ice_eqILi8ELi16EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/detail/ice_eq.hpp' line='19' column='1'/>
           </data-member>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-      <class-decl name='bool_&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-560'>
+      <class-decl name='bool_&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-549'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZN4mpl_5bool_ILb0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZN4mpl_5bool_ILb0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-563'>
+      <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-552'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-314' mangled-name='_ZN4mpl_5bool_ILb1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
+          <var-decl name='value' type-id='type-id-303' mangled-name='_ZN4mpl_5bool_ILb1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;-1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-566'>
+      <class-decl name='int_&lt;-1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-555'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILin1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILin1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-569'>
+      <class-decl name='int_&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-558'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;10&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-572'>
+      <class-decl name='int_&lt;10&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-561'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi10EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi10EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;11&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-575'>
+      <class-decl name='int_&lt;11&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-564'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi11EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi11EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;12&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-578'>
+      <class-decl name='int_&lt;12&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-567'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi12EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi12EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;13&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-581'>
+      <class-decl name='int_&lt;13&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-570'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi13EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi13EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-584'>
+      <class-decl name='int_&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-573'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi1EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-587'>
+      <class-decl name='int_&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-576'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi2EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi2EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-590'>
+      <class-decl name='int_&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-579'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi3EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi3EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;4&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-593'>
+      <class-decl name='int_&lt;4&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-582'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi4EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi4EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;5&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-596'>
+      <class-decl name='int_&lt;5&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-585'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi5EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi5EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;6&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-599'>
+      <class-decl name='int_&lt;6&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-588'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi6EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi6EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;7&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-602'>
+      <class-decl name='int_&lt;7&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-591'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi7EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi7EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-605'>
+      <class-decl name='int_&lt;8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-594'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi8EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi8EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='int_&lt;9&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-608'>
+      <class-decl name='int_&lt;9&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-597'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-340' mangled-name='_ZN4mpl_4int_ILi9EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-329' mangled-name='_ZN4mpl_4int_ILi9EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_c&lt;long unsigned int, 0ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-611'>
+      <class-decl name='integral_c&lt;long unsigned int, 0ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-600'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZN4mpl_10integral_cImLm0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZN4mpl_10integral_cImLm0EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_c&lt;long unsigned int, 16ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-614'>
+      <class-decl name='integral_c&lt;long unsigned int, 16ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-603'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZN4mpl_10integral_cImLm16EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZN4mpl_10integral_cImLm16EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_c&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-617'>
+      <class-decl name='integral_c&lt;long unsigned int, 8ul&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='43' column='1' id='type-id-606'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-1299' mangled-name='_ZN4mpl_10integral_cImLm8EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
+          <var-decl name='value' type-id='type-id-1288' mangled-name='_ZN4mpl_10integral_cImLm8EE5valueE' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/aux_/integral_wrapper.hpp' line='45' column='1'/>
         </data-member>
       </class-decl>
     </namespace-decl>
@@ -16445,20 +16445,20 @@
     <pointer-type-def type-id='type-id-65' id='type-id-45'/>
     <function-type size-in-bits='64' id='type-id-178'>
       <parameter type-id='type-id-1447'/>
-      <parameter type-id='type-id-625'/>
+      <parameter type-id='type-id-614'/>
       <parameter type-id='type-id-2017'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-209'>
-      <parameter type-id='type-id-625'/>
-      <parameter type-id='type-id-1363'/>
-      <return type-id='type-id-484'/>
+    <function-type size-in-bits='64' id='type-id-1370'>
+      <parameter type-id='type-id-614'/>
+      <parameter type-id='type-id-1352'/>
+      <return type-id='type-id-473'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-211'>
-      <parameter type-id='type-id-1363'/>
-      <return type-id='type-id-484'/>
+    <function-type size-in-bits='64' id='type-id-1372'>
+      <parameter type-id='type-id-1352'/>
+      <return type-id='type-id-473'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1313'>
+    <function-type size-in-bits='64' id='type-id-1302'>
       <parameter type-id='type-id-45'/>
       <parameter type-id='type-id-45'/>
       <return type-id='type-id-23'/>
@@ -16471,10 +16471,10 @@
       <parameter type-id='type-id-2682'/>
       <return type-id='type-id-2682'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1913'>
+    <function-type size-in-bits='64' id='type-id-1914'>
       <return type-id='type-id-65'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-2624' id='type-id-1915'>
+    <function-type size-in-bits='64' method-class-id='type-id-2624' id='type-id-1913'>
       <parameter type-id='type-id-2671' is-artificial='yes'/>
       <return type-id='type-id-65'/>
     </function-type>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index abaf5ba3..fb1f31e1 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -2932,108 +2932,108 @@
     <qualified-type-def type-id='type-id-1396' restrict='yes' id='type-id-1397'/>
     <reference-type-def kind='lvalue' type-id='type-id-38' size-in-bits='64' id='type-id-1398'/>
     <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1399'/>
-    <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-1402'/>
-    <qualified-type-def type-id='type-id-1402' restrict='yes' id='type-id-1403'/>
-    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-64'/>
-    <reference-type-def kind='lvalue' type-id='type-id-40' size-in-bits='64' id='type-id-1405'/>
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-1406'/>
-    <reference-type-def kind='lvalue' type-id='type-id-43' size-in-bits='64' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-1408'/>
-    <qualified-type-def type-id='type-id-1408' restrict='yes' id='type-id-1409'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-1410'/>
-    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-1411'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-1412'/>
-    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1413'/>
-    <reference-type-def kind='rvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1414'/>
-    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-1415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-1416'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-1417'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-1420'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-1421'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-1423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-1425'/>
-    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-1426'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-1428'/>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-1429'/>
-    <reference-type-def kind='lvalue' type-id='type-id-333' size-in-bits='64' id='type-id-1430'/>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-1431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1432'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1433'/>
-    <pointer-type-def type-id='type-id-1434' size-in-bits='64' id='type-id-1435'/>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-1436'/>
-    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-1438'/>
-    <reference-type-def kind='lvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1439'/>
-    <reference-type-def kind='rvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-1441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-351' size-in-bits='64' id='type-id-1442'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-1443'/>
-    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1444'/>
-    <reference-type-def kind='rvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1445'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-1446'/>
-    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1448'/>
-    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1449'/>
-    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1450'/>
-    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-1451'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-1452'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1453'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1454' size-in-bits='64' id='type-id-1455'/>
-    <reference-type-def kind='lvalue' type-id='type-id-368' size-in-bits='64' id='type-id-1456'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-1457'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-1458'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1459'/>
-    <pointer-type-def type-id='type-id-1460' size-in-bits='64' id='type-id-1461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1462'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-1463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1464'/>
-    <reference-type-def kind='rvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1465'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1466'/>
-    <reference-type-def kind='lvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1467'/>
-    <reference-type-def kind='rvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1468'/>
-    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-1469'/>
-    <reference-type-def kind='lvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1470'/>
-    <reference-type-def kind='rvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1471'/>
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-1472'/>
-    <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1473'/>
-    <reference-type-def kind='rvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1474'/>
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-1475'/>
-    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1476'/>
-    <reference-type-def kind='rvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1477'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-1478'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-1479'/>
-    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1480'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-1481'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1482'/>
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-1483'/>
-    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-1484'/>
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-1485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-1486'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1487'/>
-    <qualified-type-def type-id='type-id-1487' const='yes' id='type-id-1488'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
-    <reference-type-def kind='lvalue' type-id='type-id-431' size-in-bits='64' id='type-id-1490'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-1491'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-1492'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
-    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1496'/>
-    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1498'/>
-    <reference-type-def kind='lvalue' type-id='type-id-437' size-in-bits='64' id='type-id-1499'/>
-    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-1500'/>
-    <qualified-type-def type-id='type-id-1500' const='yes' id='type-id-1501'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1501' size-in-bits='64' id='type-id-1502'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1503'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1504'/>
-    <pointer-type-def type-id='type-id-1505' size-in-bits='64' id='type-id-1506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-1508'/>
-    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1509'/>
-    <reference-type-def kind='rvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1510'/>
-    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-1511'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-1400'/>
+    <qualified-type-def type-id='type-id-1400' restrict='yes' id='type-id-1401'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-64'/>
+    <reference-type-def kind='lvalue' type-id='type-id-40' size-in-bits='64' id='type-id-1403'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-1404'/>
+    <reference-type-def kind='lvalue' type-id='type-id-43' size-in-bits='64' id='type-id-1405'/>
+    <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-1406'/>
+    <qualified-type-def type-id='type-id-1406' restrict='yes' id='type-id-1407'/>
+    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-1408'/>
+    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-1409'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-1410'/>
+    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1411'/>
+    <reference-type-def kind='rvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1412'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-1413'/>
+    <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-1414'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-1415'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
+    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-1418'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1420'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-1421'/>
+    <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-1423'/>
+    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-1424'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-1427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-333' size-in-bits='64' id='type-id-1428'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-1429'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-1436'/>
+    <reference-type-def kind='lvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1437'/>
+    <reference-type-def kind='rvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-1439'/>
+    <reference-type-def kind='lvalue' type-id='type-id-351' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-1441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1442'/>
+    <reference-type-def kind='rvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-1444'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-1446'/>
+    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1447'/>
+    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-1449'/>
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-1450'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1451'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1452' size-in-bits='64' id='type-id-1453'/>
+    <reference-type-def kind='lvalue' type-id='type-id-368' size-in-bits='64' id='type-id-1454'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-1458' size-in-bits='64' id='type-id-1459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1460'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-1461'/>
+    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1462'/>
+    <reference-type-def kind='rvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1463'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='lvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1465'/>
+    <reference-type-def kind='rvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1466'/>
+    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-1467'/>
+    <reference-type-def kind='lvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1468'/>
+    <reference-type-def kind='rvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1469'/>
+    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-1470'/>
+    <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1471'/>
+    <reference-type-def kind='rvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1472'/>
+    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-1473'/>
+    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1474'/>
+    <reference-type-def kind='rvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1475'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-1476'/>
+    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1478'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-1479'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1480'/>
+    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-1481'/>
+    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-1482'/>
+    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-1485' const='yes' id='type-id-1486'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1486' size-in-bits='64' id='type-id-1487'/>
+    <reference-type-def kind='lvalue' type-id='type-id-431' size-in-bits='64' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-1490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1491' size-in-bits='64' id='type-id-1492'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1491' size-in-bits='64' id='type-id-1493'/>
+    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1494'/>
+    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
+    <reference-type-def kind='lvalue' type-id='type-id-437' size-in-bits='64' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1498' const='yes' id='type-id-1499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1501'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-1505'/>
+    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-1506'/>
+    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1507'/>
+    <reference-type-def kind='rvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-1509'/>
+    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1511'/>
     <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
     <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-1514'/>
     <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-1515'/>
@@ -3831,31 +3831,31 @@
     <reference-type-def kind='lvalue' type-id='type-id-91' size-in-bits='64' id='type-id-2448'/>
     <reference-type-def kind='rvalue' type-id='type-id-91' size-in-bits='64' id='type-id-2449'/>
     <pointer-type-def type-id='type-id-2450' size-in-bits='64' id='type-id-2451'/>
+    <qualified-type-def type-id='type-id-2451' const='yes' id='type-id-2452'/>
     <reference-type-def kind='lvalue' type-id='type-id-2452' size-in-bits='64' id='type-id-2453'/>
-    <pointer-type-def type-id='type-id-2452' size-in-bits='64' id='type-id-2454'/>
-    <qualified-type-def type-id='type-id-2454' const='yes' id='type-id-2455'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2455' size-in-bits='64' id='type-id-2456'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2454' size-in-bits='64' id='type-id-2457'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2454' size-in-bits='64' id='type-id-2458'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2459' size-in-bits='64' id='type-id-2460'/>
-    <pointer-type-def type-id='type-id-2459' size-in-bits='64' id='type-id-2461'/>
-    <qualified-type-def type-id='type-id-2461' const='yes' id='type-id-2462'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2462' size-in-bits='64' id='type-id-2463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2461' size-in-bits='64' id='type-id-2464'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2461' size-in-bits='64' id='type-id-2465'/>
-    <pointer-type-def type-id='type-id-2466' size-in-bits='64' id='type-id-2467'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2467' size-in-bits='64' id='type-id-2468'/>
-    <pointer-type-def type-id='type-id-2469' size-in-bits='64' id='type-id-2470'/>
-    <pointer-type-def type-id='type-id-2471' size-in-bits='64' id='type-id-2472'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2472' size-in-bits='64' id='type-id-2473'/>
-    <pointer-type-def type-id='type-id-2474' size-in-bits='64' id='type-id-2475'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2451' size-in-bits='64' id='type-id-2454'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2451' size-in-bits='64' id='type-id-2455'/>
+    <pointer-type-def type-id='type-id-2456' size-in-bits='64' id='type-id-2457'/>
+    <qualified-type-def type-id='type-id-2457' const='yes' id='type-id-2458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2458' size-in-bits='64' id='type-id-2459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2457' size-in-bits='64' id='type-id-2460'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2457' size-in-bits='64' id='type-id-2461'/>
+    <pointer-type-def type-id='type-id-2462' size-in-bits='64' id='type-id-2463'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2463' size-in-bits='64' id='type-id-2464'/>
+    <pointer-type-def type-id='type-id-2465' size-in-bits='64' id='type-id-2466'/>
+    <pointer-type-def type-id='type-id-2467' size-in-bits='64' id='type-id-2468'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2468' size-in-bits='64' id='type-id-2469'/>
+    <pointer-type-def type-id='type-id-2470' size-in-bits='64' id='type-id-2471'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2471' size-in-bits='64' id='type-id-2472'/>
+    <pointer-type-def type-id='type-id-2473' size-in-bits='64' id='type-id-2474'/>
+    <qualified-type-def type-id='type-id-2474' const='yes' id='type-id-2475'/>
     <reference-type-def kind='lvalue' type-id='type-id-2475' size-in-bits='64' id='type-id-2476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2477' size-in-bits='64' id='type-id-2478'/>
-    <pointer-type-def type-id='type-id-2477' size-in-bits='64' id='type-id-2479'/>
-    <qualified-type-def type-id='type-id-2479' const='yes' id='type-id-2480'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2480' size-in-bits='64' id='type-id-2481'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2479' size-in-bits='64' id='type-id-2482'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2479' size-in-bits='64' id='type-id-2483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2474' size-in-bits='64' id='type-id-2477'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2474' size-in-bits='64' id='type-id-2478'/>
+    <pointer-type-def type-id='type-id-2479' size-in-bits='64' id='type-id-2480'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2450' size-in-bits='64' id='type-id-2481'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2456' size-in-bits='64' id='type-id-2482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2473' size-in-bits='64' id='type-id-2483'/>
     <qualified-type-def type-id='type-id-2484' volatile='yes' id='type-id-1336'/>
     <qualified-type-def type-id='type-id-2485' volatile='yes' id='type-id-1339'/>
     <qualified-type-def type-id='type-id-2486' volatile='yes' id='type-id-1342'/>
@@ -4005,10 +4005,10 @@
           <typedef-decl name='const_reference' type-id='type-id-404' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2672'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1478' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2673'/>
+          <typedef-decl name='pointer' type-id='type-id-1476' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2673'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1476' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2674'/>
+          <typedef-decl name='reference' type-id='type-id-1474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2674'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4071,10 +4071,10 @@
           <typedef-decl name='const_reference' type-id='type-id-443' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2681'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1508' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2682'/>
+          <typedef-decl name='pointer' type-id='type-id-1506' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2682'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2683'/>
+          <typedef-decl name='reference' type-id='type-id-1505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2683'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2Ev'>
@@ -4098,15 +4098,15 @@
         <member-function access='public'>
           <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE7destroyIS4_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE7destroyIS4_EEvPT_'>
             <parameter type-id='type-id-125' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1506'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE9constructIS4_JPS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE9constructIS4_JPS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_'>
             <parameter type-id='type-id-125' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -4120,10 +4120,10 @@
           <typedef-decl name='const_reference' type-id='type-id-447' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2685'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2686'/>
+          <typedef-decl name='pointer' type-id='type-id-1509' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2686'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1509' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2687'/>
+          <typedef-decl name='reference' type-id='type-id-1507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2687'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4250,7 +4250,7 @@
           <function-decl name='construct&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;, mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE9constructIS6_JS5_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE9constructIS6_JS5_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-131' is-artificial='yes'/>
             <parameter type-id='type-id-1711'/>
-            <parameter type-id='type-id-1510'/>
+            <parameter type-id='type-id-1508'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -4329,7 +4329,7 @@
             <parameter type-id='type-id-133' is-artificial='yes'/>
             <parameter type-id='type-id-1730'/>
             <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -4549,7 +4549,7 @@
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE6_M_ptrEv'>
             <parameter type-id='type-id-115' is-artificial='yes'/>
-            <return type-id='type-id-1508'/>
+            <return type-id='type-id-1506'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -4772,10 +4772,10 @@
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2IJSS_RS5_RKSU_RSE_RmSO_EEEOSR_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2IJSS_RS5_RKSU_RSE_RmSO_EEEOSR_DpOT_'>
             <parameter type-id='type-id-1539' is-artificial='yes'/>
             <parameter type-id='type-id-1716'/>
-            <parameter type-id='type-id-1504'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -4823,10 +4823,10 @@
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2IJSO_RKSQ_RKSR_RSB_SI_DnEEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2IJSO_RKSQ_RKSR_RSB_SI_DnEEEOSN_DpOT_'>
             <parameter type-id='type-id-1545' is-artificial='yes'/>
             <parameter type-id='type-id-1719'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -4835,7 +4835,7 @@
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEclIJRS5_RS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEclIJRS5_RS6_EvEET0_DpOT_'>
             <parameter type-id='type-id-1545' is-artificial='yes'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -4874,10 +4874,10 @@
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2IJSO_RKSQ_RKSR_RSB_SI_SK_EEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2IJSO_RKSQ_RKSR_RSB_SI_SK_EEEOSN_DpOT_'>
             <parameter type-id='type-id-1548' is-artificial='yes'/>
             <parameter type-id='type-id-1719'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -4887,7 +4887,7 @@
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEclIJRS5_RS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEclIJRS5_RS6_EvEET0_DpOT_'>
             <parameter type-id='type-id-1548' is-artificial='yes'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -4926,7 +4926,7 @@
           <function-decl name='_Bind&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2IJS4_EEERKS8_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2IJS4_EEERKS8_DpOT_'>
             <parameter type-id='type-id-1551' is-artificial='yes'/>
             <parameter type-id='type-id-1143'/>
-            <parameter type-id='type-id-1471'/>
+            <parameter type-id='type-id-1469'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -4948,7 +4948,7 @@
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-483'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2742'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2454' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2451' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_bound_args' type-id='type-id-1258' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
@@ -4970,10 +4970,10 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2IJRKSK_SD_RSE_EEEOSI_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2IJRKSK_SD_RSE_EEEOSI_DpOT_'>
             <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-2458'/>
+            <parameter type-id='type-id-2455'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -4996,7 +4996,7 @@
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='1344' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-486'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2744'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2461' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2457' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_bound_args' type-id='type-id-1255' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
@@ -5018,7 +5018,7 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2IJRKSP_SD_SG_SL_EEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2IJRKSP_SD_SG_SL_EEEOSN_DpOT_'>
             <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-2465'/>
+            <parameter type-id='type-id-2461'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-1147'/>
             <parameter type-id='type-id-386'/>
@@ -5045,7 +5045,7 @@
       <class-decl name='_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-489'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2746'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2479' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2474' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_bound_args' type-id='type-id-1264' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
@@ -5067,7 +5067,7 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2IJS4_EEEOS6_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2IJS4_EEEOS6_DpOT_'>
             <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-2483'/>
+            <parameter type-id='type-id-2478'/>
             <parameter type-id='type-id-1135'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -6276,10 +6276,10 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEclIJRS4_SB_RSD_RmRSL_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEclIJRS4_SB_RSD_RmRSL_EvEEvPS2_DpOT_'>
             <parameter type-id='type-id-670' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1498'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-360'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-2073'/>
             <return type-id='type-id-2675'/>
@@ -6297,10 +6297,10 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;, std::mutex *&amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RSJ_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RSJ_EvEEvPS2_DpOT_'>
             <parameter type-id='type-id-673' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
+            <parameter type-id='type-id-1498'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2090'/>
             <parameter type-id='type-id-2104'/>
             <return type-id='type-id-2675'/>
@@ -6309,10 +6309,10 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;, nullptr_t &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RDnEvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RDnEvEEvPS2_DpOT_'>
             <parameter type-id='type-id-673' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
+            <parameter type-id='type-id-1498'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2090'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -6332,9 +6332,9 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::Status &amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo6StatusELb0ELb0EEclIRS1_St5tupleIJEEEEOT_S8_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo6StatusELb0ELb0EEclIRS1_St5tupleIJEEEEOT_S8_RT0_'>
             <parameter type-id='type-id-1341' is-artificial='yes'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-1444'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6342,9 +6342,9 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0ELb0EEclIRS4_St5tupleIJRKNS2_12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0ELb0EEclIRS4_St5tupleIJRKNS2_12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-1344' is-artificial='yes'/>
-            <parameter type-id='type-id-1449'/>
+            <parameter type-id='type-id-1447'/>
             <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-1449'/>
+            <return type-id='type-id-1447'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6352,17 +6352,17 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SE_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SE_RT0_'>
             <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS1_12TaskExecutor12CallbackArgsEEEEEOT_SD_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS1_12TaskExecutor12CallbackArgsEEEEEOT_SD_RT0_'>
             <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6370,9 +6370,9 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor12CallbackArgsELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor12CallbackArgsELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_'>
             <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1470'/>
+            <parameter type-id='type-id-1468'/>
             <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1468'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6380,17 +6380,17 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6398,25 +6398,25 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_'>
             <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS0_8executor21RemoteCommandResponseEEEEEEEOT_SG_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS0_8executor21RemoteCommandResponseEEEEEEEOT_SG_RT0_'>
             <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRNS0_8executor12TaskExecutor14CallbackHandleEEEEEOT_SE_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRNS0_8executor12TaskExecutor14CallbackHandleEEEEEOT_SE_RT0_'>
             <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-2802'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6654,12 +6654,12 @@
       <class-decl name='_Sp_counted_ptr&lt;mongo::repl::ReplicationExecutor::Callback *, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='364' column='1' id='type-id-684'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-680'/>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_ptr' type-id='type-id-1506' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='387' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-1504' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='387' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr' mangled-name='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EEC2ES4_'>
             <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1504'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -6720,7 +6720,7 @@
           <function-decl name='_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEC2IJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEES4_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEC2IJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEES4_DpOT_'>
             <parameter type-id='type-id-1730' is-artificial='yes'/>
             <parameter type-id='type-id-1046'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -6728,7 +6728,7 @@
         <member-function access='private'>
           <function-decl name='_M_ptr' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv'>
             <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <return type-id='type-id-1508'/>
+            <return type-id='type-id-1506'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
@@ -6895,7 +6895,7 @@
         <member-function access='public'>
           <function-decl name='__shared_count&lt;mongo::repl::ReplicationExecutor::Callback *&gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IPN5mongo4repl19ReplicationExecutor8CallbackEEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IPN5mongo4repl19ReplicationExecutor8CallbackEEET_'>
             <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1504'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -6903,9 +6903,9 @@
           <function-decl name='__shared_count&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IN5mongo4repl19ReplicationExecutor5EventESaIS7_EJPS6_RSt14_List_iteratorINS4_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IN5mongo4repl19ReplicationExecutor5EventESaIS7_EJPS6_RSt14_List_iteratorINS4_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_'>
             <parameter type-id='type-id-1987' is-artificial='yes'/>
             <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1506'/>
             <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -7026,7 +7026,7 @@
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Callback&gt;' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='870' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_'>
             <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1504'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -7215,7 +7215,7 @@
       </class-decl>
       <class-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1024'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-1508' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-1506' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
@@ -7265,7 +7265,7 @@
             <parameter type-id='type-id-1996' is-artificial='yes'/>
             <parameter type-id='type-id-2829'/>
             <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -7786,7 +7786,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2845'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1435' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2846'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1433' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2846'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2846' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
@@ -7829,7 +7829,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2847'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1401' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2848'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1513' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2848'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2848' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
@@ -7877,7 +7877,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2849'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2467' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2850'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2850'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2850' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
@@ -7993,7 +7993,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2851'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2470' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2852'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2852'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2852' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
@@ -8036,7 +8036,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2853'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2472' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2854'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2854'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='_Requires&lt;_Callable&lt;typename decay&lt;_Bind&lt;void (*(_Placeholder&lt;1&gt;, function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt;, RemoteCommandRequest, StatusWith&lt;RemoteCommandResponse&gt;))(const CallbackArgs &amp;, const function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt; &amp;, const RemoteCommandRequest &amp;, const StatusWith&lt;RemoteCommandResponse&gt; &amp;)&gt; &gt;::type&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' type-id='type-id-2856' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2163' column='1' id='type-id-2855'/>
@@ -8149,7 +8149,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2858'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2859'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2859'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-2859' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
@@ -8520,14 +8520,14 @@
           <function-decl name='_M_insert&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE9_M_insertIJS3_EEEvSt14_List_iteratorIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE9_M_insertIJS3_EEEvSt14_List_iteratorIS3_EDpOT_'>
             <parameter type-id='type-id-2087' is-artificial='yes'/>
             <parameter type-id='type-id-642'/>
-            <parameter type-id='type-id-1510'/>
+            <parameter type-id='type-id-1508'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE14_M_create_nodeIJS3_EEEPSt10_List_nodeIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE14_M_create_nodeIJS3_EEEPSt10_List_nodeIS3_EDpOT_'>
             <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-1510'/>
+            <parameter type-id='type-id-1508'/>
             <return type-id='type-id-2093'/>
           </function-decl>
         </member-function>
@@ -8696,7 +8696,7 @@
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;mongo::repl::ReplicationExecutor::Callback&gt;' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_'>
             <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1504'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -8875,7 +8875,7 @@
             <parameter type-id='type-id-2339' is-artificial='yes'/>
             <parameter type-id='type-id-2829'/>
             <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -9243,7 +9243,7 @@
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_'>
             <parameter type-id='type-id-2372' is-artificial='yes'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -9372,7 +9372,7 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackArgs, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IJS3_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IJS3_EvEEDpOT_'>
             <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
+            <parameter type-id='type-id-1469'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -9388,7 +9388,7 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-386'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-400'/>
@@ -9414,10 +9414,10 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IJS3_RS5_RKS7_RS9_RmRKSF_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IJS3_RS5_RKS7_RS9_RmRKSF_EvEEDpOT_'>
             <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -9435,7 +9435,7 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
             <parameter type-id='type-id-400'/>
@@ -9460,10 +9460,10 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IJS3_RKS5_RKS6_RS9_SE_DnEvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IJS3_RKS5_RKS6_RS9_SE_DnEvEEDpOT_'>
             <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -9480,7 +9480,7 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
             <parameter type-id='type-id-400'/>
@@ -9506,10 +9506,10 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IJS3_RKS5_RKS6_RS9_SE_SG_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IJS3_RKS5_RKS6_RS9_SE_SG_EvEEDpOT_'>
             <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -9661,7 +9661,7 @@
             <parameter type-id='type-id-2402' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -10978,20 +10978,20 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2IS3_EEOT_'>
             <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
+            <parameter type-id='type-id-1469'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS4_'>
             <parameter type-id='type-id-1603'/>
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1468'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Head_base&lt;0, mongo::repl::ReplicationExecutor *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-532'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1500' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1498' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11002,7 +11002,7 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -11031,14 +11031,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IS3_EEOT_'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EE7_M_headERS4_'>
             <parameter type-id='type-id-1606'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11050,7 +11050,7 @@
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -11079,14 +11079,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&gt;' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IRS3_EEOT_'>
             <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -11438,7 +11438,7 @@
       </class-decl>
       <class-decl name='_Head_base&lt;1, mongo::Status &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-553'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1444' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1442' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11449,7 +11449,7 @@
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EEC2ES2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EEC2ES2_'>
             <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -11478,7 +11478,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EE7_M_headERS3_'>
             <parameter type-id='type-id-1627'/>
-            <return type-id='type-id-1444'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11524,14 +11524,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Status&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2IS1_EEOT_'>
             <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1443'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EE7_M_headERS2_'>
             <parameter type-id='type-id-1630'/>
-            <return type-id='type-id-1444'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -11577,21 +11577,21 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_'>
             <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-1465'/>
+            <parameter type-id='type-id-1463'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_'>
             <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_'>
             <parameter type-id='type-id-1633'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12014,21 +12014,21 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_'>
             <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-1465'/>
+            <parameter type-id='type-id-1463'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_'>
             <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_'>
             <parameter type-id='type-id-1657'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12176,14 +12176,14 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2IS4_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2IS4_EEOT_'>
             <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-1450'/>
+            <parameter type-id='type-id-1448'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS5_'>
             <parameter type-id='type-id-1666'/>
-            <return type-id='type-id-1449'/>
+            <return type-id='type-id-1447'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12229,21 +12229,21 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IS3_EEOT_'>
             <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-1474'/>
+            <parameter type-id='type-id-1472'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IRS3_EEOT_'>
             <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS4_'>
             <parameter type-id='type-id-1669'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -12761,7 +12761,7 @@
         <member-function access='public' constructor='yes'>
           <function-decl name='_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEC2IJS3_EEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEC2IJS3_EEEDpOT_'>
             <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-1510'/>
+            <parameter type-id='type-id-1508'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -12832,24 +12832,24 @@
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2960'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEE9__do_wrapEOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEE9__do_wrapEOSI_'>
-            <parameter type-id='type-id-2458'/>
-            <return type-id='type-id-2458'/>
+            <parameter type-id='type-id-2455'/>
+            <return type-id='type-id-2455'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2961'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEE9__do_wrapEOSN_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEE9__do_wrapEOSN_'>
-            <parameter type-id='type-id-2465'/>
-            <return type-id='type-id-2465'/>
+            <parameter type-id='type-id-2461'/>
+            <return type-id='type-id-2461'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2962'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKSt8functionIFvvEEEE9__do_wrapEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKSt8functionIFvvEEEE9__do_wrapEOS6_'>
-            <parameter type-id='type-id-2483'/>
-            <return type-id='type-id-2483'/>
+            <parameter type-id='type-id-2478'/>
+            <return type-id='type-id-2478'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -13070,7 +13070,7 @@
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_'>
             <parameter type-id='type-id-1755' is-artificial='yes'/>
             <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -13238,14 +13238,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackArgs, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IS3_JEvEEOT_DpOT0_'>
             <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
+            <parameter type-id='type-id-1469'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS4_'>
             <parameter type-id='type-id-1765'/>
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1468'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13270,7 +13270,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-386'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-400'/>
@@ -13296,10 +13296,10 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IS3_JRS5_RKS7_RS9_RmRKSF_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IS3_JRS5_RKS7_RS9_RmRKSF_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -13308,7 +13308,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_headERSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_headERSG_'>
             <parameter type-id='type-id-1768'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13333,7 +13333,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
             <parameter type-id='type-id-400'/>
@@ -13358,10 +13358,10 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IS3_JRKS5_RKS6_RS9_SE_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IS3_JRKS5_RKS6_RS9_SE_DnEvEEOT_DpOT0_'>
             <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -13369,7 +13369,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_headERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_headERSF_'>
             <parameter type-id='type-id-1772'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13394,7 +13394,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
             <parameter type-id='type-id-400'/>
@@ -13420,10 +13420,10 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IS3_JRKS5_RKS6_RS9_SE_SG_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IS3_JRKS5_RKS6_RS9_SE_SG_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -13432,7 +13432,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_headERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_headERSH_'>
             <parameter type-id='type-id-1776'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13630,7 +13630,7 @@
             <parameter type-id='type-id-1793' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -13827,7 +13827,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEEC2ES2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEEC2ES2_'>
             <parameter type-id='type-id-1812' is-artificial='yes'/>
-            <parameter type-id='type-id-1444'/>
+            <parameter type-id='type-id-1442'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -13848,7 +13848,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEE7_M_headERS3_'>
             <parameter type-id='type-id-1810'/>
-            <return type-id='type-id-1444'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -13885,7 +13885,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_headERS2_'>
             <parameter type-id='type-id-1813'/>
-            <return type-id='type-id-1444'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13935,9 +13935,9 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2IRS2_JRKS4_RS6_RmRKSC_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2IRS2_JRKS4_RS6_RmRKSC_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -13946,7 +13946,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_headERSD_'>
             <parameter type-id='type-id-1816'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -13997,7 +13997,7 @@
             <parameter type-id='type-id-1822' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -14057,7 +14057,7 @@
             <parameter type-id='type-id-1826' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -14328,7 +14328,7 @@
           <function-decl name='_Tuple_impl&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2IRKS8_JRS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2IRKS8_JRS9_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1847' is-artificial='yes'/>
             <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -14427,7 +14427,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_headERS6_'>
             <parameter type-id='type-id-1855'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -14473,14 +14473,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2IRS2_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2IRS2_JEvEEOT_DpOT0_'>
             <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1462'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_headERS3_'>
             <parameter type-id='type-id-1859'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1462'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -14530,7 +14530,7 @@
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2IRKS1_JRS5_RmRKSB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2IRKS1_JRS5_RmRKSB_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1865' is-artificial='yes'/>
             <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -14588,7 +14588,7 @@
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2IRKS1_JRS5_SC_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2IRKS1_JRS5_SC_DnEvEEOT_DpOT0_'>
             <parameter type-id='type-id-1869' is-artificial='yes'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -14646,7 +14646,7 @@
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2IRKS1_JRS5_SC_SE_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2IRKS1_JRS5_SC_SE_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1873' is-artificial='yes'/>
             <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -14715,7 +14715,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS5_'>
             <parameter type-id='type-id-1878'/>
-            <return type-id='type-id-1449'/>
+            <return type-id='type-id-1447'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -14762,7 +14762,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2IRS3_JSA_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2IRS3_JSA_DnEvEEOT_DpOT0_'>
             <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -14770,7 +14770,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_headERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_headERSB_'>
             <parameter type-id='type-id-1882'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -14818,7 +14818,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2IRS3_JSA_SC_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2IRS3_JSA_SC_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2091'/>
             <parameter type-id='type-id-2105'/>
             <return type-id='type-id-2675'/>
@@ -14827,7 +14827,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_headERSD_'>
             <parameter type-id='type-id-1886'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -14875,7 +14875,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2IRS3_JRmRKS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2IRS3_JRmRKS9_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <parameter type-id='type-id-2448'/>
             <parameter type-id='type-id-1147'/>
             <return type-id='type-id-2675'/>
@@ -14884,7 +14884,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_headERSA_'>
             <parameter type-id='type-id-1890'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -15416,7 +15416,7 @@
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::ReplicationExecutor::Event, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2986'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2987'/>
+          <typedef-decl name='type' type-id='type-id-1505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2987'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::StorageInterface, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2988'>
@@ -15468,12 +15468,12 @@
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3004'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1444' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2821'/>
+          <typedef-decl name='type' type-id='type-id-1442' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2821'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3005'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1449' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3006'/>
+          <typedef-decl name='type' type-id='type-id-1447' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3006'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::executor::NetworkInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3007'>
@@ -15483,22 +15483,22 @@
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3009'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3010'/>
+          <typedef-decl name='type' type-id='type-id-1462' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3010'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3011'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1470' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3012'/>
+          <typedef-decl name='type' type-id='type-id-1468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3012'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3013'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2817'/>
+          <typedef-decl name='type' type-id='type-id-1471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2817'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3014'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1503' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3015'/>
+          <typedef-decl name='type' type-id='type-id-1501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3015'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3016'>
@@ -15813,8 +15813,8 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE9constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE9constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOSE_'>
             <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1508'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-3076'/>
           </function-decl>
@@ -15822,22 +15822,22 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_'>
             <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1506'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_'>
             <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1506'/>
             <return type-id='type-id-3077'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE12_S_constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSG_DpOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE12_S_constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSG_DpOSH_'>
             <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1508'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1506'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-3076'/>
           </function-decl>
@@ -15874,7 +15874,7 @@
             <parameter type-id='type-id-2015'/>
             <parameter type-id='type-id-1730'/>
             <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-3085'/>
           </function-decl>
@@ -15892,7 +15892,7 @@
             <parameter type-id='type-id-2015'/>
             <parameter type-id='type-id-1730'/>
             <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1504'/>
+            <parameter type-id='type-id-1502'/>
             <parameter type-id='type-id-1703'/>
             <return type-id='type-id-3085'/>
           </function-decl>
@@ -16224,7 +16224,7 @@
           <var-decl name='first' type-id='type-id-2550' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-1487' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-1485' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16236,7 +16236,7 @@
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2113' is-artificial='yes'/>
             <parameter type-id='type-id-2551'/>
-            <parameter type-id='type-id-1489'/>
+            <parameter type-id='type-id-1487'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -16293,8 +16293,8 @@
         <member-function access='public'>
           <function-decl name='pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle, void&gt;' mangled-name='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2IS3_S6_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2IS3_S6_vEEOT_OT0_'>
             <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-1510'/>
-            <parameter type-id='type-id-1474'/>
+            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1472'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -16524,7 +16524,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3176'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1500' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2164'/>
+          <typedef-decl name='type' type-id='type-id-1498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2164'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3177'>
@@ -16890,47 +16890,47 @@
       </class-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3263'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2452' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2313'/>
+          <typedef-decl name='type' type-id='type-id-2450' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2313'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3264'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2459' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2315'/>
+          <typedef-decl name='type' type-id='type-id-2456' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2315'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3265'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2317'/>
+          <typedef-decl name='type' type-id='type-id-2473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2317'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3266'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2454' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2319'/>
+          <typedef-decl name='type' type-id='type-id-2451' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2319'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3267'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2461' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2321'/>
+          <typedef-decl name='type' type-id='type-id-2457' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2321'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3268'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2467' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2323'/>
+          <typedef-decl name='type' type-id='type-id-2463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2323'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3269'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2472' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2325'/>
+          <typedef-decl name='type' type-id='type-id-2468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2325'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3270'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2327'/>
+          <typedef-decl name='type' type-id='type-id-2471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2327'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3271'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2329'/>
+          <typedef-decl name='type' type-id='type-id-2474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2329'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3272'/>
@@ -16938,7 +16938,7 @@
       <class-decl name='try_to_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='357' column='1' id='type-id-2882'/>
       <class-decl name='tuple_element&lt;1, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='97' column='1' id='type-id-3274'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='98' column='1' id='type-id-3275'/>
+          <typedef-decl name='type' type-id='type-id-1485' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='98' column='1' id='type-id-3275'/>
         </member-type>
       </class-decl>
       <class-decl name='unary_function&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2952'/>
@@ -17125,7 +17125,7 @@
           <var-decl name='_M_const_object' type-id='type-id-52' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_M_function_pointer' type-id='type-id-2451' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1760' column='1'/>
+          <var-decl name='_M_function_pointer' type-id='type-id-2480' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1760' column='1'/>
         </data-member>
       </union-decl>
       <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2534'/>
@@ -17176,8 +17176,8 @@
         <return type-id='type-id-2922'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZSt11__addressofIN5mongo4repl19ReplicationExecutor8WorkItemEEPT_RS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo4repl19ReplicationExecutor8WorkItemEEPT_RS4_'>
-        <parameter type-id='type-id-1509' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1511'/>
+        <parameter type-id='type-id-1507' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1509'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::Status &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo6StatusEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo6StatusEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2122' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -17249,19 +17249,19 @@
       </function-decl>
       <function-decl name='forward&lt;mongo::Status &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo6StatusEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo6StatusEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-2155' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1444'/>
+        <return type-id='type-id-1442'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::Status&gt;' mangled-name='_ZSt7forwardIN5mongo6StatusEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo6StatusEEOT_RNSt16remove_referenceIS2_E4typeE'>
         <parameter type-id='type-id-2155' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1445'/>
+        <return type-id='type-id-1443'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS6_E4typeE'>
         <parameter type-id='type-id-2158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1449'/>
+        <return type-id='type-id-1447'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt7forwardIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1450'/>
+        <return type-id='type-id-1448'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::NetworkInterface *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo8executor16NetworkInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo8executor16NetworkInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2650' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -17269,39 +17269,39 @@
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2160' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1464'/>
+        <return type-id='type-id-1462'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt7forwardIN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS3_E4typeE'>
         <parameter type-id='type-id-2160' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1465'/>
+        <return type-id='type-id-1463'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2162' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1470'/>
+        <return type-id='type-id-1468'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt7forwardIN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2162' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1471'/>
+        <return type-id='type-id-1469'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2163' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1473'/>
+        <return type-id='type-id-1471'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt7forwardIN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2163' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1474'/>
+        <return type-id='type-id-1472'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2165' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1503'/>
+        <return type-id='type-id-1501'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZSt7forwardIPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2165' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1504'/>
+        <return type-id='type-id-1502'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZSt7forwardIN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS4_E4typeE'>
         <parameter type-id='type-id-2168' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1510'/>
+        <return type-id='type-id-1508'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE'>
         <parameter type-id='type-id-2656' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -17385,15 +17385,15 @@
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEOT_RNSt16remove_referenceISJ_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEOT_RNSt16remove_referenceISJ_E4typeE'>
         <parameter type-id='type-id-2314' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2453'/>
+        <return type-id='type-id-2481'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEOT_RNSt16remove_referenceISO_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEOT_RNSt16remove_referenceISO_E4typeE'>
         <parameter type-id='type-id-2316' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2460'/>
+        <return type-id='type-id-2482'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKSt8functionIFvvEEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKSt8functionIFvvEEEEOT_RNSt16remove_referenceIS7_E4typeE'>
         <parameter type-id='type-id-2318' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2478'/>
+        <return type-id='type-id-2483'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE'>
         <return type-id='type-id-2675'/>
@@ -17423,15 +17423,15 @@
         <return type-id='type-id-2144'/>
       </function-decl>
       <function-decl name='move&lt;mongo::SharedBuffer &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo12SharedBufferEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo12SharedBufferEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1439' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1437' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2153'/>
       </function-decl>
       <function-decl name='move&lt;mongo::Status &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo6StatusEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo6StatusEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1444' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1442' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2156'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1473' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1471' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-189'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackState *&amp;&gt;' mangled-name='_ZSt4moveIRPN5mongo8executor12TaskExecutor13CallbackStateEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPN5mongo8executor12TaskExecutor13CallbackStateEEONSt16remove_referenceIT_E4typeEOS7_'>
@@ -17439,7 +17439,7 @@
         <return type-id='type-id-2652'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo8executor12TaskExecutor11EventHandleEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo8executor12TaskExecutor11EventHandleEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1476' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1474' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-191'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventState *&amp;&gt;' mangled-name='_ZSt4moveIRPN5mongo8executor12TaskExecutor10EventStateEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPN5mongo8executor12TaskExecutor10EventStateEEONSt16remove_referenceIT_E4typeEOS7_'>
@@ -17447,7 +17447,7 @@
         <return type-id='type-id-2654'/>
       </function-decl>
       <function-decl name='move&lt;mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo4repl19ReplicationExecutor8WorkItemEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo4repl19ReplicationExecutor8WorkItemEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1509' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-1507' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2167'/>
       </function-decl>
       <function-decl name='move&lt;std::_Any_data &amp;&gt;' mangled-name='_ZSt4moveIRSt9_Any_dataEONSt16remove_referenceIT_E4typeEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt9_Any_dataEONSt16remove_referenceIT_E4typeEOS3_'>
@@ -17683,27 +17683,27 @@
         <return type-id='type-id-2310'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEONSt16remove_referenceIT_E4typeEOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEONSt16remove_referenceIT_E4typeEOSL_'>
-        <parameter type-id='type-id-2457' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2454' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2320'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEONSt16remove_referenceIT_E4typeEOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEONSt16remove_referenceIT_E4typeEOSQ_'>
-        <parameter type-id='type-id-2464' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2460' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2322'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-2468' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2464' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2324'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-2473' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2469' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2326'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-2476' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2472' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2328'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt8functionIFvvEEEEONSt16remove_referenceIT_E4typeEOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt8functionIFvvEEEEONSt16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-2482' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-2477' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-2330'/>
       </function-decl>
       <function-decl name='swap&lt;bool (*)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&gt;' mangled-name='_ZSt4swapIPFbRSt9_Any_dataRKS0_St18_Manager_operationEEvRT_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFbRSt9_Any_dataRKS0_St18_Manager_operationEEvRT_S8_'>
@@ -17732,18 +17732,18 @@
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataEEvRT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataEEvRT_S6_'>
-        <parameter type-id='type-id-2468' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2468' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2464' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2464' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEvRT_SC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEvRT_SC_'>
-        <parameter type-id='type-id-2473' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2473' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2469' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2469' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEvRT_SC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEvRT_SC_'>
-        <parameter type-id='type-id-2476' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2476' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2472' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2472' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <namespace-decl name='__detail'>
@@ -17991,12 +17991,12 @@
       </namespace-decl>
       <function-decl name='allocate_shared&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZSt15allocate_sharedIN5mongo4repl19ReplicationExecutor5EventESaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_ERKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15allocate_sharedIN5mongo4repl19ReplicationExecutor5EventESaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_ERKT0_DpOT1_'>
         <parameter type-id='type-id-1048' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
-        <parameter type-id='type-id-1504' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
+        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
         <parameter type-id='type-id-1703' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
         <return type-id='type-id-1201'/>
       </function-decl>
       <function-decl name='make_shared&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZSt11make_sharedIN5mongo4repl19ReplicationExecutor5EventEJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_EDpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11make_sharedIN5mongo4repl19ReplicationExecutor5EventEJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_EDpOT0_'>
-        <parameter type-id='type-id-1504' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
+        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
         <parameter type-id='type-id-1703' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
         <return type-id='type-id-1201'/>
       </function-decl>
@@ -18041,8 +18041,8 @@
         <return type-id='type-id-1192'/>
       </function-decl>
       <function-decl name='make_pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt9make_pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENS8_IT0_E6__typeEEOS9_OSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9make_pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENS8_IT0_E6__typeEEOS9_OSC_'>
-        <parameter type-id='type-id-1510' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
-        <parameter type-id='type-id-1474' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <parameter type-id='type-id-1508' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <parameter type-id='type-id-1472' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
         <return type-id='type-id-1192'/>
       </function-decl>
       <typedef-decl name='string' type-id='type-id-2549' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-2552'/>
@@ -18357,7 +18357,7 @@
       </function-decl>
       <function-decl name='bind&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;, mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt4bindIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESC_JDpT0_EE4typeEOSC_DpOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESC_JDpT0_EE4typeEOSC_DpOSD_'>
         <parameter type-id='type-id-1143' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1469' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2183'/>
       </function-decl>
       <function-decl name='bind&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)(), mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEJRPS2_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESA_JDpT0_EE4typeEOSA_DpOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEJRPS2_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESA_JDpT0_EE4typeEOSA_DpOSB_'>
@@ -18365,14 +18365,14 @@
         <return type-id='type-id-2175'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEJRKSt12_PlaceholderILi1EESD_RSE_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESP_JDpT0_EE4typeEOSP_DpOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEJRKSt12_PlaceholderILi1EESD_RSE_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESP_JDpT0_EE4typeEOSP_DpOSQ_'>
-        <parameter type-id='type-id-2453' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2481' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1464' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1462' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2185'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEJRKSt12_PlaceholderILi1EESD_SG_SL_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueEST_JDpT0_EE4typeEOST_DpOSU_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEJRKSt12_PlaceholderILi1EESD_SG_SL_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueEST_JDpT0_EE4typeEOST_DpOSU_'>
-        <parameter type-id='type-id-2460' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2482' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-386' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
@@ -18380,32 +18380,32 @@
         <return type-id='type-id-2187'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;), const std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZSt4bindIRFvRKSt8functionIFvvEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueES8_JDpT0_EE4typeEOS8_DpOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKSt8functionIFvvEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueES8_JDpT0_EE4typeEOS8_DpOS9_'>
-        <parameter type-id='type-id-2478' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2483' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-1135' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2190'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;), mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEJPS2_RS4_RKSt12_PlaceholderILi1EERSD_RmSN_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEJPS2_RS4_RKSt12_PlaceholderILi1EERSD_RmSN_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_'>
-        <parameter type-id='type-id-1504' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1464' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1462' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1473' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-2448' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2177'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_DnEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_DnEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_'>
-        <parameter type-id='type-id-1504' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-679' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1473' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-2091' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2179'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_SJ_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_SJ_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_'>
-        <parameter type-id='type-id-1504' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-679' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1473' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-2091' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-2105' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-2181'/>
@@ -18765,7 +18765,7 @@
       </function-decl>
       <function-decl name='forward_as_tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRPN5mongo16OperationContextERNS0_6StatusEEESt5tupleIJDpOT_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRPN5mongo16OperationContextERNS0_6StatusEEESt5tupleIJDpOT_EES9_'>
         <parameter type-id='type-id-2593' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <parameter type-id='type-id-1444' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <parameter type-id='type-id-1442' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
         <return type-id='type-id-1228'/>
       </function-decl>
     </namespace-decl>
@@ -19043,7 +19043,7 @@
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-1403'/>
+      <parameter type-id='type-id-1401'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19151,11 +19151,11 @@
       <return type-id='type-id-2675'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2451'/>
+      <parameter type-id='type-id-2480'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='/usr/include/stdlib.h' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2451'/>
+      <parameter type-id='type-id-2480'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='exit' filepath='/usr/include/stdlib.h' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19534,33 +19534,33 @@
       <parameter type-id='type-id-2504'/>
       <parameter type-id='type-id-271'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-1407'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-193'/>
       <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-1407'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-271'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-1407'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2504'/>
       <parameter type-id='type-id-274'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-1407'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-193'/>
       <parameter type-id='type-id-1397'/>
       <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-1407'/>
       <return type-id='type-id-92'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='450' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19882,7 +19882,7 @@
     </function-decl>
     <function-decl name='frexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1404'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='ldexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20229,19 +20229,19 @@
     <function-decl name='remquo' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1404'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='remquof' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1404'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='remquol' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-41'/>
       <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1404'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='lrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20365,42 +20365,42 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-3318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-3318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE11fetchAndAddEj'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-3318'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-3318'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20421,13 +20421,13 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -20435,14 +20435,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-3319'/>
@@ -20451,13 +20451,13 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -20465,14 +20465,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-3319'/>
@@ -20481,13 +20481,13 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -20495,14 +20495,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1412' is-artificial='yes'/>
+            <parameter type-id='type-id-1410' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-3319'/>
@@ -20531,34 +20531,34 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2Ev'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-347'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2EOS0_'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-1414'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2ERKS0_'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20571,68 +20571,68 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-347'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-1414'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-347'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-1414'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
+            <parameter type-id='type-id-1412'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
+            <parameter type-id='type-id-1413' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20647,14 +20647,14 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
@@ -20662,14 +20662,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
@@ -20677,14 +20677,14 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-299'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1415' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
@@ -20703,14 +20703,14 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -20718,14 +20718,14 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -20733,14 +20733,14 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-306'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
+            <parameter type-id='type-id-1419' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -20756,21 +20756,21 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-3322'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-3322'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-3322'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20783,21 +20783,21 @@
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-3323'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-3323'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
+            <parameter type-id='type-id-1421' is-artificial='yes'/>
             <parameter type-id='type-id-3323'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20809,20 +20809,20 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' mangled-name='_ZN5mongo6Date_tC2Ev' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Date_tC2Ev'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-1078'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20850,9 +20850,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+=&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt; &gt;' mangled-name='_ZN5mongo6Date_tpLINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEERS0_T_' filepath='src/mongo/util/time_support.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Date_tpLINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEERS0_T_'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-1085'/>
-            <return type-id='type-id-1424'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -20876,40 +20876,40 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-1078'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-1078'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -20982,34 +20982,34 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-3326'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21017,7 +21017,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-2552'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21025,34 +21025,34 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-3326'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21060,7 +21060,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-3327'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21068,34 +21068,34 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-3326'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-43'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21103,7 +21103,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
             <parameter type-id='type-id-3328'/>
             <parameter type-id='type-id-3324'/>
             <return type-id='type-id-2675'/>
@@ -21285,20 +21285,20 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' mangled-name='_ZN5mongo15NamespaceStringC2Ev' filepath='src/mongo/db/namespace_string.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15NamespaceStringC2Ev'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' filepath='src/mongo/db/namespace_string.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' filepath='src/mongo/db/namespace_string.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
@@ -21341,102 +21341,102 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1331'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-3330'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1331'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-3330'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-1331'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1429' is-artificial='yes'/>
             <parameter type-id='type-id-3330'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -21454,14 +21454,14 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-339'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
@@ -21469,7 +21469,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-342'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-2554'/>
@@ -21483,48 +21483,48 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PseudoRandom' size-in-bits='128' visibility='default' filepath='src/mongo/platform/random.h' line='39' column='1' id='type-id-1437'>
+      <class-decl name='PseudoRandom' size-in-bits='128' visibility='default' filepath='src/mongo/platform/random.h' line='39' column='1' id='type-id-1435'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_x' type-id='type-id-81' visibility='default' filepath='src/mongo/platform/random.h' line='77' column='1'/>
         </data-member>
@@ -21539,28 +21539,28 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1436' is-artificial='yes'/>
             <parameter type-id='type-id-81'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1436' is-artificial='yes'/>
             <parameter type-id='type-id-95'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1436' is-artificial='yes'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64El' filepath='src/mongo/platform/random.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12PseudoRandom9nextInt64El'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1436' is-artificial='yes'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-82'/>
           </function-decl>
@@ -21574,27 +21574,27 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1443' is-artificial='yes'/>
+                <parameter type-id='type-id-1441' is-artificial='yes'/>
                 <parameter type-id='type-id-3318'/>
                 <return type-id='type-id-2675'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBuffer6Holder4dataEv'>
-                <parameter type-id='type-id-1443' is-artificial='yes'/>
+                <parameter type-id='type-id-1441' is-artificial='yes'/>
                 <return type-id='type-id-192'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1443' is-artificial='yes'/>
+                <parameter type-id='type-id-1441' is-artificial='yes'/>
                 <parameter type-id='type-id-3318'/>
                 <return type-id='type-id-2675'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1443' is-artificial='yes'/>
+                <parameter type-id='type-id-1441' is-artificial='yes'/>
                 <parameter type-id='type-id-3318'/>
                 <return type-id='type-id-2675'/>
               </function-decl>
@@ -21606,28 +21606,28 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2Ev'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2ERKS0_' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2ERKS0_'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2EOS0_' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2EOS0_'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1440'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1438'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1441'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -21639,69 +21639,69 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBuffer4swapERS0_'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1439'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1437'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1440'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1438'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1441'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1440'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1438'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1441' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-1441'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-354'>
         <member-type access='private'>
-          <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1447'>
+          <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1445'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='refs' type-id='type-id-3340' visibility='default' filepath='src/mongo/base/status.h' line='124' column='1'/>
             </data-member>
@@ -21716,7 +21716,7 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='ErrorInfo' filepath='src/mongo/base/status.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1448' is-artificial='yes'/>
+                <parameter type-id='type-id-1446' is-artificial='yes'/>
                 <parameter type-id='type-id-321'/>
                 <parameter type-id='type-id-2552'/>
                 <parameter type-id='type-id-40'/>
@@ -21725,7 +21725,7 @@
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='ErrorInfo' filepath='src/mongo/base/status.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1448' is-artificial='yes'/>
+                <parameter type-id='type-id-1446' is-artificial='yes'/>
                 <parameter type-id='type-id-321'/>
                 <parameter type-id='type-id-3328'/>
                 <parameter type-id='type-id-40'/>
@@ -21735,11 +21735,11 @@
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_error' type-id='type-id-1448' visibility='default' filepath='src/mongo/base/status.h' line='134' column='1'/>
+          <var-decl name='_error' type-id='type-id-1446' visibility='default' filepath='src/mongo/base/status.h' line='134' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-2552'/>
             <parameter type-id='type-id-40'/>
@@ -21748,27 +21748,27 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2ERKS0_'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2EOS0_'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
-            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
+            <parameter type-id='type-id-1443'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusD2Ev'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2Ev'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -21791,19 +21791,19 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unref' mangled-name='_ZN5mongo6Status5unrefEPNS0_9ErrorInfoE' filepath='src/mongo/base/status.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status5unrefEPNS0_9ErrorInfoE'>
-            <parameter type-id='type-id-1448'/>
+            <parameter type-id='type-id-1446'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='ref' mangled-name='_ZN5mongo6Status3refEPNS0_9ErrorInfoE' filepath='src/mongo/base/status.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status3refEPNS0_9ErrorInfoE'>
-            <parameter type-id='type-id-1448'/>
+            <parameter type-id='type-id-1446'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3327'/>
             <parameter type-id='type-id-40'/>
@@ -21812,33 +21812,33 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
-            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
+            <parameter type-id='type-id-1443'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3328'/>
             <parameter type-id='type-id-40'/>
@@ -21847,35 +21847,35 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-356'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
-            <parameter type-id='type-id-1445'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
+            <parameter type-id='type-id-1443'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo6StatusaSEOS0_' filepath='src/mongo/base/status.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusaSEOS0_'>
-            <parameter type-id='type-id-1446' is-artificial='yes'/>
-            <parameter type-id='type-id-1445'/>
-            <return type-id='type-id-1444'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
+            <parameter type-id='type-id-1443'/>
+            <return type-id='type-id-1442'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -21888,7 +21888,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-2552'/>
             <parameter type-id='type-id-40'/>
@@ -21897,14 +21897,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor21RemoteCommandResponseEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor21RemoteCommandResponseEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-388'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -21929,7 +21929,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3327'/>
             <parameter type-id='type-id-40'/>
@@ -21938,21 +21938,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-388'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3328'/>
             <parameter type-id='type-id-40'/>
@@ -21961,14 +21961,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-388'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -21983,7 +21983,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-2552'/>
             <parameter type-id='type-id-40'/>
@@ -21992,14 +21992,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ES3_' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ES3_'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-398'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22012,13 +22012,13 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <return type-id='type-id-1473'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3328'/>
             <parameter type-id='type-id-40'/>
@@ -22027,14 +22027,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450' is-artificial='yes'/>
             <parameter type-id='type-id-398'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22061,7 +22061,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_10ErrorCodes5ErrorESsi' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_10ErrorCodes5ErrorESsi'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-2552'/>
             <parameter type-id='type-id-40'/>
@@ -22070,14 +22070,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ES3_' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ES3_'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-402'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22096,13 +22096,13 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE8getValueEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE8getValueEv'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
-            <return type-id='type-id-1476'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
+            <return type-id='type-id-1474'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <parameter type-id='type-id-3328'/>
             <parameter type-id='type-id-40'/>
@@ -22111,14 +22111,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1453' is-artificial='yes'/>
+            <parameter type-id='type-id-1451' is-artificial='yes'/>
             <parameter type-id='type-id-402'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22151,84 +22151,84 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEEC2Ev'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-370'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi' filepath='src/mongo/bson/util/builder.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;int&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEl' filepath='src/mongo/bson/util/builder.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEl'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-42'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;long&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIlEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIlEERS2_T_iPKc'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-42'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEPKc'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEm' filepath='src/mongo/bson/util/builder.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEm'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-91'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;unsigned long&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMImEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMImEERS2_T_iPKc'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-91'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1456'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -22239,26 +22239,26 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-370'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1455' is-artificial='yes'/>
             <parameter type-id='type-id-370'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22276,20 +22276,20 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2EPKc'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-2675'/>
@@ -22297,7 +22297,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKSs' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2ERKSs'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22318,20 +22318,20 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-2675'/>
@@ -22339,27 +22339,27 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-58'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-2675'/>
@@ -22367,7 +22367,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -22382,21 +22382,21 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-314'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-102'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-3342'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22404,7 +22404,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22412,27 +22412,27 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-314'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-102'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-3342'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22440,7 +22440,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22448,27 +22448,27 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-314'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-102'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-3342'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22476,7 +22476,7 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-2675'/>
@@ -22484,15 +22484,15 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='TrivialAllocator' size-in-bits='8' visibility='default' filepath='src/mongo/bson/util/builder.h' line='77' column='1' id='type-id-1460'>
+      <class-decl name='TrivialAllocator' size-in-bits='8' visibility='default' filepath='src/mongo/bson/util/builder.h' line='77' column='1' id='type-id-1458'>
         <member-function access='public'>
           <function-decl name='Realloc' mangled-name='_ZN5mongo16TrivialAllocator7ReallocEPvm' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator7ReallocEPvm'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1459' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-52'/>
@@ -22500,14 +22500,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='Free' mangled-name='_ZN5mongo16TrivialAllocator4FreeEPv' filepath='src/mongo/bson/util/builder.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator4FreeEPv'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1459' is-artificial='yes'/>
             <parameter type-id='type-id-52'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Malloc' mangled-name='_ZN5mongo16TrivialAllocator6MallocEm' filepath='src/mongo/bson/util/builder.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator6MallocEm'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1459' is-artificial='yes'/>
             <parameter type-id='type-id-92'/>
             <return type-id='type-id-52'/>
           </function-decl>
@@ -22515,7 +22515,7 @@
       </class-decl>
       <class-decl name='_BufBuilder&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='120' column='1' id='type-id-380'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='al' type-id='type-id-1460' visibility='default' filepath='src/mongo/bson/util/builder.h' line='124' column='1'/>
+          <var-decl name='al' type-id='type-id-1458' visibility='default' filepath='src/mongo/bson/util/builder.h' line='124' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='data' type-id='type-id-192' visibility='default' filepath='src/mongo/bson/util/builder.h' line='313' column='1'/>
@@ -22531,81 +22531,81 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-382'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC2Ei'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED2Ev' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED2Ev'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-192'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='kill' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4killEv' filepath='src/mongo/bson/util/builder.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4killEv'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-382'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-382'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-1461' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -22691,20 +22691,20 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -22712,20 +22712,20 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -22733,20 +22733,20 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-372'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-2554'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-2675'/>
@@ -22754,10 +22754,10 @@
         </member-function>
       </class-decl>
       <typedef-decl name='AtomicUInt32' type-id='type-id-290' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-3340'/>
-      <typedef-decl name='BufBuilder' type-id='type-id-380' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1418'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-380' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1416'/>
       <typedef-decl name='Milliseconds' type-id='type-id-3315' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-327'/>
       <typedef-decl name='Seconds' type-id='type-id-3316' filepath='src/mongo/util/time_support.h' line='48' column='1' id='type-id-3342'/>
-      <typedef-decl name='StringBuilder' type-id='type-id-368' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1454'/>
+      <typedef-decl name='StringBuilder' type-id='type-id-368' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1452'/>
       <class-decl name='OperationContext' visibility='default' is-declaration-only='yes' id='type-id-2588'/>
       <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3348'/>
       <class-decl name='ThreadPool' visibility='default' is-declaration-only='yes' id='type-id-3339'/>
@@ -22767,10 +22767,10 @@
         <class-decl name='ReplicationExecutor' size-in-bits='7488' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='92' column='1' id='type-id-437'>
           <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2601'/>
           <member-type access='private'>
-            <class-decl name='Callback' size-in-bits='640' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='327' column='1' id='type-id-1505'>
+            <class-decl name='Callback' size-in-bits='640' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='327' column='1' id='type-id-1503'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2603'/>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='_executor' type-id='type-id-1500' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='341' column='1'/>
+                <var-decl name='_executor' type-id='type-id-1498' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='341' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <var-decl name='_callbackFn' type-id='type-id-395' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='344' column='1'/>
@@ -22786,8 +22786,8 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='Callback' mangled-name='_ZN5mongo4repl19ReplicationExecutor8CallbackC2EPS1_St8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKSt14_List_iteratorINS1_8WorkItemEERKNS6_11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8CallbackC2EPS1_St8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKSt14_List_iteratorINS1_8WorkItemEERKNS6_11EventHandleE'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <parameter type-id='type-id-1500'/>
+                  <parameter type-id='type-id-1504' is-artificial='yes'/>
+                  <parameter type-id='type-id-1498'/>
                   <parameter type-id='type-id-396'/>
                   <parameter type-id='type-id-644'/>
                   <parameter type-id='type-id-404'/>
@@ -22796,19 +22796,19 @@
               </member-function>
               <member-function access='public' destructor='yes' vtable-offset='0'>
                 <function-decl name='~Callback' mangled-name='_ZN5mongo4repl19ReplicationExecutor8CallbackD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8CallbackD2Ev'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
+                  <parameter type-id='type-id-1504' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='2'>
                 <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ReplicationExecutor8Callback6cancelEv' filepath='src/mongo/db/repl/replication_executor.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8Callback6cancelEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
+                  <parameter type-id='type-id-1504' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='3'>
                 <function-decl name='waitForCompletion' mangled-name='_ZN5mongo4repl19ReplicationExecutor8Callback17waitForCompletionEv' filepath='src/mongo/db/repl/replication_executor.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8Callback17waitForCompletionEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
+                  <parameter type-id='type-id-1504' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
@@ -22818,7 +22818,7 @@
             <class-decl name='Event' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='379' column='1' id='type-id-441'>
               <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2607'/>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='_executor' type-id='type-id-1500' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='395' column='1'/>
+                <var-decl name='_executor' type-id='type-id-1498' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='395' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <var-decl name='_isSignaled' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='398' column='1'/>
@@ -22830,43 +22830,43 @@
                 <var-decl name='_iter' type-id='type-id-632' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='400' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='640'>
-                <var-decl name='_waiters' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='401' column='1'/>
+                <var-decl name='_waiters' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='401' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='Event' mangled-name='_ZN5mongo4repl19ReplicationExecutor5EventC2EPS1_RKSt14_List_iteratorINS_8executor12TaskExecutor11EventHandleEE' filepath='src/mongo/db/repl/replication_executor.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5EventC2EPS1_RKSt14_List_iteratorINS_8executor12TaskExecutor11EventHandleEE'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
-                  <parameter type-id='type-id-1500'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
+                  <parameter type-id='type-id-1498'/>
                   <parameter type-id='type-id-634'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='private'>
                 <function-decl name='_signal_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event14_signal_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event14_signal_inlockEv'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' destructor='yes' vtable-offset='0'>
                 <function-decl name='~Event' mangled-name='_ZN5mongo4repl19ReplicationExecutor5EventD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5EventD2Ev'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='2'>
                 <function-decl name='signal' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event6signalEv' filepath='src/mongo/db/repl/replication_executor.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event6signalEv'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='3'>
                 <function-decl name='waitUntilSignaled' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event17waitUntilSignaledEv' filepath='src/mongo/db/repl/replication_executor.h' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event17waitUntilSignaledEv'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='4'>
                 <function-decl name='isSignaled' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event10isSignaledEv' filepath='src/mongo/db/repl/replication_executor.h' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event10isSignaledEv'>
-                  <parameter type-id='type-id-1508' is-artificial='yes'/>
+                  <parameter type-id='type-id-1506' is-artificial='yes'/>
                   <return type-id='type-id-1'/>
                 </function-decl>
               </member-function>
@@ -22891,7 +22891,7 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='WorkItem' mangled-name='_ZN5mongo4repl19ReplicationExecutor8WorkItemC2Ev' filepath='src/mongo/db/repl/replication_executor.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8WorkItemC2Ev'>
-                  <parameter type-id='type-id-1511' is-artificial='yes'/>
+                  <parameter type-id='type-id-1509' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
@@ -22901,10 +22901,10 @@
             <typedef-decl name='EventList' type-id='type-id-1159' filepath='src/mongo/db/repl/replication_executor.h' line='217' column='1' id='type-id-3350'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='WorkQueue' type-id='type-id-1169' filepath='src/mongo/db/repl/replication_executor.h' line='212' column='1' id='type-id-1512'/>
+            <typedef-decl name='WorkQueue' type-id='type-id-1169' filepath='src/mongo/db/repl/replication_executor.h' line='212' column='1' id='type-id-1510'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_random' type-id='type-id-1437' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='301' column='1'/>
+            <var-decl name='_random' type-id='type-id-1435' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='301' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
             <var-decl name='_networkInterface' type-id='type-id-1277' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='303' column='1'/>
@@ -22925,22 +22925,22 @@
             <var-decl name='_noMoreWaitingThreads' type-id='type-id-3349' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='311' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1408'>
-            <var-decl name='_freeQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='312' column='1'/>
+            <var-decl name='_freeQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='312' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1536'>
-            <var-decl name='_readyQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='313' column='1'/>
+            <var-decl name='_readyQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='313' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1664'>
-            <var-decl name='_dbWorkInProgressQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='314' column='1'/>
+            <var-decl name='_dbWorkInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='314' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1792'>
-            <var-decl name='_exclusiveLockInProgressQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='315' column='1'/>
+            <var-decl name='_exclusiveLockInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='315' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1920'>
-            <var-decl name='_networkInProgressQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='316' column='1'/>
+            <var-decl name='_networkInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='316' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2048'>
-            <var-decl name='_sleepersQueue' type-id='type-id-1512' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='317' column='1'/>
+            <var-decl name='_sleepersQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='317' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2176'>
             <var-decl name='_unsignaledEvents' type-id='type-id-3350' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='318' column='1'/>
@@ -22965,14 +22965,14 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ReplicationExecutor' filepath='src/mongo/db/repl/replication_executor.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-439'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ReplicationExecutor' mangled-name='_ZN5mongo4repl19ReplicationExecutorC2EPNS_8executor16NetworkInterfaceEPNS0_16StorageInterfaceEl' filepath='src/mongo/db/repl/replication_executor.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutorC2EPNS_8executor16NetworkInterfaceEPNS0_16StorageInterfaceEl'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-2597'/>
               <parameter type-id='type-id-2622'/>
               <parameter type-id='type-id-82'/>
@@ -22981,14 +22981,14 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleWorkWithGlobalExclusiveLock' mangled-name='_ZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleDBWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKNS_15NamespaceStringENS_8LockModeE' filepath='src/mongo/db/repl/replication_executor.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKNS_15NamespaceStringENS_8LockModeE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-397'/>
               <parameter type-id='type-id-331'/>
               <parameter type-id='type-id-3347'/>
@@ -23003,66 +23003,66 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ReplicationExecutor3runEv' filepath='src/mongo/db/repl/replication_executor.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor3runEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='getWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor7getWorkEv' filepath='src/mongo/db/repl/replication_executor.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7getWorkEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-1192'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_getCallbackFromHandle' mangled-name='_ZN5mongo4repl19ReplicationExecutor22_getCallbackFromHandleERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor22_getCallbackFromHandleERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-400'/>
-              <return type-id='type-id-1506'/>
+              <return type-id='type-id-1504'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='finishShutdown' mangled-name='_ZN5mongo4repl19ReplicationExecutor14finishShutdownEv' filepath='src/mongo/db/repl/replication_executor.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14finishShutdownEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_getEventFromHandle' mangled-name='_ZN5mongo4repl19ReplicationExecutor19_getEventFromHandleERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor19_getEventFromHandleERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-404'/>
-              <return type-id='type-id-1508'/>
+              <return type-id='type-id-1506'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='signalEvent_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor18signalEvent_inlockERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor18signalEvent_inlockERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-404'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='maybeNotifyShutdownComplete_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor34maybeNotifyShutdownComplete_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor34maybeNotifyShutdownComplete_inlockEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='makeEvent_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor16makeEvent_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor16makeEvent_inlockEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-365'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='enqueueWork_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor18enqueueWork_inlockEPSt4listINS1_8WorkItemESaIS3_EERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor18enqueueWork_inlockEPSt4listINS1_8WorkItemESaIS3_EERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
-              <parameter type-id='type-id-1513'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
+              <parameter type-id='type-id-1511'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_finishRemoteCommand' mangled-name='_ZN5mongo4repl19ReplicationExecutor20_finishRemoteCommandERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEERKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSB_25RemoteCommandCallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor20_finishRemoteCommandERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEERKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSB_25RemoteCommandCallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-386'/>
               <parameter type-id='type-id-360'/>
               <parameter type-id='type-id-400'/>
@@ -23073,88 +23073,88 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleDBWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_doOperation' mangled-name='_ZN5mongo4repl19ReplicationExecutor12_doOperationEPNS_16OperationContextERKNS_6StatusERKNS_8executor12TaskExecutor14CallbackHandleEPSt4listINS1_8WorkItemESaISD_EEPSt5mutex' filepath='src/mongo/db/repl/replication_executor.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12_doOperationEPNS_16OperationContextERKNS_6StatusERKNS_8executor12TaskExecutor14CallbackHandleEPSt4listINS1_8WorkItemESaISD_EEPSt5mutex'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-2590'/>
               <parameter type-id='type-id-356'/>
               <parameter type-id='type-id-400'/>
-              <parameter type-id='type-id-1513'/>
+              <parameter type-id='type-id-1511'/>
               <parameter type-id='type-id-2101'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='scheduleReadySleepers_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor28scheduleReadySleepers_inlockENS_6Date_tE' filepath='src/mongo/db/repl/replication_executor.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor28scheduleReadySleepers_inlockENS_6Date_tE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-314'/>
               <return type-id='type-id-314'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='nextRandomInt64' mangled-name='_ZN5mongo4repl19ReplicationExecutor15nextRandomInt64El' filepath='src/mongo/db/repl/replication_executor.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor15nextRandomInt64El'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-82'/>
               <return type-id='type-id-82'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~ReplicationExecutor' mangled-name='_ZN5mongo4repl19ReplicationExecutorD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutorD2Ev'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='startup' mangled-name='_ZN5mongo4repl19ReplicationExecutor7startupEv' filepath='src/mongo/db/repl/replication_executor.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7startupEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='3'>
             <function-decl name='shutdown' mangled-name='_ZN5mongo4repl19ReplicationExecutor8shutdownEv' filepath='src/mongo/db/repl/replication_executor.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8shutdownEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='join' mangled-name='_ZN5mongo4repl19ReplicationExecutor4joinEv' filepath='src/mongo/db/repl/replication_executor.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor4joinEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='getDiagnosticString' mangled-name='_ZN5mongo4repl19ReplicationExecutor19getDiagnosticStringEv' filepath='src/mongo/db/repl/replication_executor.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor19getDiagnosticStringEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-2552'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='6'>
             <function-decl name='now' mangled-name='_ZN5mongo4repl19ReplicationExecutor3nowEv' filepath='src/mongo/db/repl/replication_executor.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor3nowEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-314'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='7'>
             <function-decl name='makeEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor9makeEventEv' filepath='src/mongo/db/repl/replication_executor.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor9makeEventEv'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <return type-id='type-id-365'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='8'>
             <function-decl name='signalEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor11signalEventERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor11signalEventERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-404'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='9'>
             <function-decl name='onEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor7onEventERKNS_8executor12TaskExecutor11EventHandleERKSt8functionIFvRKNS3_12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7onEventERKNS_8executor12TaskExecutor11EventHandleERKSt8functionIFvRKNS3_12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-404'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
@@ -23162,21 +23162,21 @@
           </member-function>
           <member-function access='public' vtable-offset='10'>
             <function-decl name='waitForEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor12waitForEventERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12waitForEventERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-404'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='11'>
             <function-decl name='scheduleWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor12scheduleWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12scheduleWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='12'>
             <function-decl name='scheduleWorkAt' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleWorkAtENS_6Date_tERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleWorkAtENS_6Date_tERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-314'/>
               <parameter type-id='type-id-397'/>
               <return type-id='type-id-362'/>
@@ -23184,7 +23184,7 @@
           </member-function>
           <member-function access='public' vtable-offset='13'>
             <function-decl name='scheduleRemoteCommand' mangled-name='_ZN5mongo4repl19ReplicationExecutor21scheduleRemoteCommandERKNS_8executor20RemoteCommandRequestERKSt8functionIFvRKNS2_12TaskExecutor25RemoteCommandCallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor21scheduleRemoteCommandERKNS_8executor20RemoteCommandRequestERKSt8functionIFvRKNS2_12TaskExecutor25RemoteCommandCallbackArgsEEE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-386'/>
               <parameter type-id='type-id-411'/>
               <return type-id='type-id-362'/>
@@ -23192,14 +23192,14 @@
           </member-function>
           <member-function access='public' vtable-offset='14'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ReplicationExecutor6cancelERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor6cancelERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-400'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='15'>
             <function-decl name='wait' mangled-name='_ZN5mongo4repl19ReplicationExecutor4waitERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor4waitERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1500' is-artificial='yes'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
               <parameter type-id='type-id-400'/>
               <return type-id='type-id-2675'/>
             </function-decl>
@@ -23246,13 +23246,13 @@
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23263,7 +23263,7 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23273,13 +23273,13 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23290,7 +23290,7 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23300,13 +23300,13 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23317,7 +23317,7 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1466' is-artificial='yes'/>
+              <parameter type-id='type-id-1464' is-artificial='yes'/>
               <parameter type-id='type-id-325'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-299'/>
@@ -23338,13 +23338,13 @@
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-327'/>
@@ -23353,13 +23353,13 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-327'/>
@@ -23368,13 +23368,13 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1469' is-artificial='yes'/>
+              <parameter type-id='type-id-1467' is-artificial='yes'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-297'/>
               <parameter type-id='type-id-327'/>
@@ -23391,13 +23391,13 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1475' is-artificial='yes'/>
+                  <parameter type-id='type-id-1473' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='private' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1475' is-artificial='yes'/>
+                  <parameter type-id='type-id-1473' is-artificial='yes'/>
                   <parameter type-id='type-id-1195'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
@@ -23410,13 +23410,13 @@
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1475' is-artificial='yes'/>
+                  <parameter type-id='type-id-1473' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='private' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1475' is-artificial='yes'/>
+                  <parameter type-id='type-id-1473' is-artificial='yes'/>
                   <parameter type-id='type-id-1195'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
@@ -23430,26 +23430,26 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1478' is-artificial='yes'/>
+                  <parameter type-id='type-id-1476' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1478' is-artificial='yes'/>
+                  <parameter type-id='type-id-1476' is-artificial='yes'/>
                   <parameter type-id='type-id-1198'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1478' is-artificial='yes'/>
+                  <parameter type-id='type-id-1476' is-artificial='yes'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1478' is-artificial='yes'/>
+                  <parameter type-id='type-id-1476' is-artificial='yes'/>
                   <parameter type-id='type-id-1198'/>
                   <return type-id='type-id-2675'/>
                 </function-decl>
@@ -23478,7 +23478,7 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackArgs' filepath='src/mongo/executor/task_executor.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1472' is-artificial='yes'/>
+                  <parameter type-id='type-id-1470' is-artificial='yes'/>
                   <parameter type-id='type-id-2602'/>
                   <parameter type-id='type-id-398'/>
                   <parameter type-id='type-id-354'/>
@@ -23488,7 +23488,7 @@
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackArgs' filepath='src/mongo/executor/task_executor.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1472' is-artificial='yes'/>
+                  <parameter type-id='type-id-1470' is-artificial='yes'/>
                   <parameter type-id='type-id-3353'/>
                   <parameter type-id='type-id-398'/>
                   <parameter type-id='type-id-354'/>
@@ -23514,7 +23514,7 @@
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='RemoteCommandCallbackArgs' filepath='src/mongo/executor/task_executor.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1479' is-artificial='yes'/>
+                  <parameter type-id='type-id-1477' is-artificial='yes'/>
                   <parameter type-id='type-id-2602'/>
                   <parameter type-id='type-id-400'/>
                   <parameter type-id='type-id-386'/>
@@ -23524,7 +23524,7 @@
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='RemoteCommandCallbackArgs' filepath='src/mongo/executor/task_executor.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1479' is-artificial='yes'/>
+                  <parameter type-id='type-id-1477' is-artificial='yes'/>
                   <parameter type-id='type-id-3353'/>
                   <parameter type-id='type-id-400'/>
                   <parameter type-id='type-id-386'/>
@@ -23556,20 +23556,20 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1481' is-artificial='yes'/>
+              <parameter type-id='type-id-1479' is-artificial='yes'/>
               <parameter type-id='type-id-414'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1481' is-artificial='yes'/>
+              <parameter type-id='type-id-1479' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1481' is-artificial='yes'/>
+              <parameter type-id='type-id-1479' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -23583,14 +23583,14 @@
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1482' is-artificial='yes'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
               <parameter type-id='type-id-40'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1482' is-artificial='yes'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
               <parameter type-id='type-id-58'/>
               <parameter type-id='type-id-40'/>
               <return type-id='type-id-2675'/>
@@ -23598,7 +23598,7 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1482' is-artificial='yes'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-40'/>
               <return type-id='type-id-2675'/>
@@ -23631,7 +23631,7 @@
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE'>
-              <parameter type-id='type-id-1483' is-artificial='yes'/>
+              <parameter type-id='type-id-1481' is-artificial='yes'/>
               <parameter type-id='type-id-3355'/>
               <return type-id='type-id-2675'/>
             </function-decl>
@@ -23646,20 +23646,20 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
+              <parameter type-id='type-id-1483' is-artificial='yes'/>
               <parameter type-id='type-id-425'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
+              <parameter type-id='type-id-1483' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
+              <parameter type-id='type-id-1483' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -23685,20 +23685,20 @@
           </data-member>
           <member-function access='private'>
             <function-decl name='LogDomain' filepath='src/mongo/logger/log_domain.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1487' is-artificial='yes'/>
+              <parameter type-id='type-id-1485' is-artificial='yes'/>
               <parameter type-id='type-id-429'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='LogDomain' filepath='src/mongo/logger/log_domain.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1487' is-artificial='yes'/>
+              <parameter type-id='type-id-1485' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogDomain' filepath='src/mongo/logger/log_domain.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1487' is-artificial='yes'/>
+              <parameter type-id='type-id-1485' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -23715,27 +23715,27 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogManager' filepath='src/mongo/logger/log_manager.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1491' is-artificial='yes'/>
+              <parameter type-id='type-id-1489' is-artificial='yes'/>
               <parameter type-id='type-id-433'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogManager' filepath='src/mongo/logger/log_manager.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1491' is-artificial='yes'/>
+              <parameter type-id='type-id-1489' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogManager' filepath='src/mongo/logger/log_manager.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1491' is-artificial='yes'/>
+              <parameter type-id='type-id-1489' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='getGlobalDomain' mangled-name='_ZN5mongo6logger10LogManager15getGlobalDomainEv' filepath='src/mongo/logger/log_manager.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger10LogManager15getGlobalDomainEv'>
-              <parameter type-id='type-id-1491' is-artificial='yes'/>
-              <return type-id='type-id-1481'/>
+              <parameter type-id='type-id-1489' is-artificial='yes'/>
+              <return type-id='type-id-1479'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -23745,7 +23745,7 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogSeverity' mangled-name='_ZN5mongo6logger11LogSeverityC2Ei' filepath='src/mongo/logger/log_severity.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger11LogSeverityC2Ei'>
-              <parameter type-id='type-id-1492' is-artificial='yes'/>
+              <parameter type-id='type-id-1490' is-artificial='yes'/>
               <parameter type-id='type-id-40'/>
               <return type-id='type-id-2675'/>
             </function-decl>
@@ -23757,9 +23757,9 @@
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogstreamBuilder' size-in-bits='384' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='49' column='1' id='type-id-1493'>
+        <class-decl name='LogstreamBuilder' size-in-bits='384' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='49' column='1' id='type-id-1491'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_domain' type-id='type-id-1498' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='226' column='1'/>
+            <var-decl name='_domain' type-id='type-id-1496' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='226' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
             <var-decl name='_contextName' type-id='type-id-2552' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='227' column='1'/>
@@ -23781,8 +23781,8 @@
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
+              <parameter type-id='type-id-1496'/>
               <parameter type-id='type-id-2552'/>
               <parameter type-id='type-id-434'/>
               <return type-id='type-id-2675'/>
@@ -23790,8 +23790,8 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
+              <parameter type-id='type-id-1496'/>
               <parameter type-id='type-id-2552'/>
               <parameter type-id='type-id-434'/>
               <parameter type-id='type-id-420'/>
@@ -23800,8 +23800,8 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
+              <parameter type-id='type-id-1496'/>
               <parameter type-id='type-id-2554'/>
               <parameter type-id='type-id-416'/>
               <return type-id='type-id-2675'/>
@@ -23809,14 +23809,14 @@
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
-              <parameter type-id='type-id-1495'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
+              <parameter type-id='type-id-1493'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -23828,31 +23828,31 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEPKc' filepath='src/mongo/logger/logstream_builder.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsEPKc'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
               <parameter type-id='type-id-58'/>
-              <return type-id='type-id-1494'/>
+              <return type-id='type-id-1492'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKSs' filepath='src/mongo/logger/logstream_builder.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsERKSs'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
               <parameter type-id='type-id-2554'/>
-              <return type-id='type-id-1494'/>
+              <return type-id='type-id-1492'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilder6streamEv'>
-              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
               <return type-id='type-id-2644'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='MessageLogDomain' type-id='type-id-427' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1497'/>
+        <typedef-decl name='MessageLogDomain' type-id='type-id-427' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1495'/>
         <class-decl name='Appender&lt;mongo::logger::MessageEventEphemeral&gt;' visibility='default' is-declaration-only='yes' id='type-id-2611'/>
         <class-decl name='MessageEventEphemeral' visibility='default' is-declaration-only='yes' id='type-id-3359'/>
         <class-decl name='Tee' visibility='default' is-declaration-only='yes' id='type-id-2618'/>
         <function-decl name='globalLogDomain' mangled-name='_ZN5mongo6logger15globalLogDomainEv' filepath='src/mongo/logger/logger.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger15globalLogDomainEv'>
-          <return type-id='type-id-1481'/>
+          <return type-id='type-id-1479'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='stdx'>
@@ -23860,11 +23860,11 @@
         <typedef-decl name='thread' type-id='type-id-1211' filepath='src/mongo/stdx/thread.h' line='36' column='1' id='type-id-3351'/>
       </namespace-decl>
       <function-decl name='intrusive_ptr_add_ref' mangled-name='_ZN5mongo21intrusive_ptr_add_refEPNS_12SharedBuffer6HolderE' filepath='src/mongo/util/shared_buffer.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21intrusive_ptr_add_refEPNS_12SharedBuffer6HolderE'>
-        <parameter type-id='type-id-1443' name='h' filepath='src/mongo/util/shared_buffer.h' line='89' column='1'/>
+        <parameter type-id='type-id-1441' name='h' filepath='src/mongo/util/shared_buffer.h' line='89' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='intrusive_ptr_release' mangled-name='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE' filepath='src/mongo/util/shared_buffer.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE'>
-        <parameter type-id='type-id-1443' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
+        <parameter type-id='type-id-1441' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
     </namespace-decl>
@@ -23872,7 +23872,7 @@
       <namespace-decl name='str'>
         <class-decl name='stream' size-in-bits='256' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='56' column='1' id='type-id-449'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='ss' type-id='type-id-1454' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='58' column='1'/>
+            <var-decl name='ss' type-id='type-id-1452' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='58' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [20]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA20_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA20_cEERS1_RKT_'>
@@ -23956,7 +23956,7 @@
     <namespace-decl name='boost'>
       <class-decl name='intrusive_ptr&lt;mongo::SharedBuffer::Holder&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='52' column='1' id='type-id-147'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='px' type-id='type-id-1443' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
+          <var-decl name='px' type-id='type-id-1441' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev'>
@@ -23967,7 +23967,7 @@
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
+            <parameter type-id='type-id-1441'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -24001,7 +24001,7 @@
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEptEv'>
             <parameter type-id='type-id-240' is-artificial='yes'/>
-            <return type-id='type-id-1443'/>
+            <return type-id='type-id-1441'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24020,7 +24020,7 @@
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
+            <parameter type-id='type-id-1441'/>
             <parameter type-id='type-id-1'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -24485,26 +24485,26 @@
         <return type-id='type-id-185'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::RemoteCommandResponse &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor21RemoteCommandResponseEEEONS_16remove_referenceIT_E4typeEOS6_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor21RemoteCommandResponseEEEONS_16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1467' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <parameter type-id='type-id-1465' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
         <return type-id='type-id-187'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEEONS_16remove_referenceIT_E4typeEOS7_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEEONS_16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-1473' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <parameter type-id='type-id-1471' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
         <return type-id='type-id-189'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor12TaskExecutor11EventHandleEEEONS_16remove_referenceIT_E4typeEOS7_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor12TaskExecutor11EventHandleEEEONS_16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-1476' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <parameter type-id='type-id-1474' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
         <return type-id='type-id-191'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN5boost7forwardIN5mongo8executor12TaskExecutor14CallbackHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost7forwardIN5mongo8executor12TaskExecutor14CallbackHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE'>
-        <parameter type-id='type-id-1473' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
+        <parameter type-id='type-id-1471' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
         <parameter type-id='type-id-2516' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
-        <return type-id='type-id-1474'/>
+        <return type-id='type-id-1472'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::EventHandle, mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZN5boost7forwardIN5mongo8executor12TaskExecutor11EventHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost7forwardIN5mongo8executor12TaskExecutor11EventHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE'>
-        <parameter type-id='type-id-1476' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
+        <parameter type-id='type-id-1474' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
         <parameter type-id='type-id-2516' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
-        <return type-id='type-id-1477'/>
+        <return type-id='type-id-1475'/>
       </function-decl>
       <namespace-decl name='optional_detail'>
         <class-decl name='aligned_storage&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-163'>
@@ -25211,19 +25211,19 @@
             <typedef-decl name='pointer_const_type' type-id='type-id-391' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3419'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1469' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3420'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1467' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3420'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='reference_const_type' type-id='type-id-390' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3421'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1467' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3422'/>
+            <typedef-decl name='reference_type' type-id='type-id-1465' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3422'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1468' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3423'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1466' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3423'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1468' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3424'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1466' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3424'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor21RemoteCommandResponseEE4moveERS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor21RemoteCommandResponseEE4moveERS4_'>
@@ -25240,19 +25240,19 @@
             <typedef-decl name='pointer_const_type' type-id='type-id-401' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3427'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1475' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3428'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1473' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3428'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='reference_const_type' type-id='type-id-400' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3429'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1473' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3430'/>
+            <typedef-decl name='reference_type' type-id='type-id-1471' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3430'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1474' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3431'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1472' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3431'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1474' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3432'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1472' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3432'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor14CallbackHandleEE4moveERS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor14CallbackHandleEE4moveERS5_'>
@@ -25269,19 +25269,19 @@
             <typedef-decl name='pointer_const_type' type-id='type-id-405' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3435'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1478' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3436'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1476' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3436'/>
           </member-type>
           <member-type access='public'>
             <typedef-decl name='reference_const_type' type-id='type-id-404' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3437'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1476' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3438'/>
+            <typedef-decl name='reference_type' type-id='type-id-1474' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3438'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1477' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3439'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1475' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3439'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1477' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3440'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1475' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3440'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor11EventHandleEE4moveERS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor11EventHandleEE4moveERS5_'>
@@ -25324,18 +25324,18 @@
       <parameter type-id='type-id-2748'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1400'>
+    <function-type size-in-bits='64' id='type-id-1512'>
       <parameter type-id='type-id-460'/>
       <parameter type-id='type-id-2590'/>
       <parameter type-id='type-id-356'/>
       <return type-id='type-id-2770'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1404'>
+    <function-type size-in-bits='64' id='type-id-1402'>
       <parameter type-id='type-id-52'/>
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1434'>
+    <function-type size-in-bits='64' id='type-id-1432'>
       <parameter type-id='type-id-460'/>
       <return type-id='type-id-2590'/>
     </function-type>
@@ -25348,44 +25348,44 @@
       <return type-id='type-id-2640'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-2450'>
-      <return type-id='type-id-2675'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-2452'>
       <parameter type-id='type-id-394'/>
       <parameter type-id='type-id-1147'/>
       <parameter type-id='type-id-386'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2459'>
+    <function-type size-in-bits='64' id='type-id-2456'>
       <parameter type-id='type-id-394'/>
       <parameter type-id='type-id-1147'/>
       <parameter type-id='type-id-386'/>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2466'>
+    <function-type size-in-bits='64' id='type-id-2462'>
       <parameter type-id='type-id-460'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2469'>
+    <function-type size-in-bits='64' id='type-id-2465'>
       <parameter type-id='type-id-460'/>
       <parameter type-id='type-id-360'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2471'>
+    <function-type size-in-bits='64' id='type-id-2467'>
       <parameter type-id='type-id-460'/>
       <parameter type-id='type-id-394'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2474'>
+    <function-type size-in-bits='64' id='type-id-2470'>
       <parameter type-id='type-id-460'/>
       <parameter type-id='type-id-408'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2477'>
+    <function-type size-in-bits='64' id='type-id-2473'>
       <parameter type-id='type-id-1135'/>
       <return type-id='type-id-2675'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-2479'>
+      <return type-id='type-id-2675'/>
+    </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <qualified-type-def type-id='type-id-3446' const='yes' id='type-id-3447'/>
@@ -25696,11 +25696,11 @@
     <pointer-type-def type-id='type-id-3659' size-in-bits='64' id='type-id-3661'/>
     <reference-type-def kind='lvalue' type-id='type-id-3532' size-in-bits='64' id='type-id-3662'/>
     <pointer-type-def type-id='type-id-3532' size-in-bits='64' id='type-id-3663'/>
-    <qualified-type-def type-id='type-id-1453' const='yes' id='type-id-3664'/>
+    <qualified-type-def type-id='type-id-1451' const='yes' id='type-id-3664'/>
     <reference-type-def kind='lvalue' type-id='type-id-3664' size-in-bits='64' id='type-id-3665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1453' size-in-bits='64' id='type-id-3666'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1453' size-in-bits='64' id='type-id-3667'/>
-    <qualified-type-def type-id='type-id-1475' const='yes' id='type-id-3668'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-3666'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-3667'/>
+    <qualified-type-def type-id='type-id-1473' const='yes' id='type-id-3668'/>
     <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3669'/>
     <reference-type-def kind='lvalue' type-id='type-id-3538' size-in-bits='64' id='type-id-3670'/>
     <pointer-type-def type-id='type-id-3538' size-in-bits='64' id='type-id-3671'/>
@@ -25833,17 +25833,17 @@
     <reference-type-def kind='rvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3808'/>
     <pointer-type-def type-id='type-id-3646' size-in-bits='64' id='type-id-3809'/>
     <reference-type-def kind='rvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3810'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3811' size-in-bits='64' id='type-id-3812'/>
-    <pointer-type-def type-id='type-id-3811' size-in-bits='64' id='type-id-3813'/>
-    <qualified-type-def type-id='type-id-3813' const='yes' id='type-id-3814'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3814' size-in-bits='64' id='type-id-3815'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3816'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3817'/>
-    <pointer-type-def type-id='type-id-3818' size-in-bits='64' id='type-id-3819'/>
-    <qualified-type-def type-id='type-id-3819' const='yes' id='type-id-3820'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3820' size-in-bits='64' id='type-id-3821'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3822'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3823'/>
+    <pointer-type-def type-id='type-id-3811' size-in-bits='64' id='type-id-3812'/>
+    <qualified-type-def type-id='type-id-3812' const='yes' id='type-id-3813'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3812' size-in-bits='64' id='type-id-3815'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3812' size-in-bits='64' id='type-id-3816'/>
+    <pointer-type-def type-id='type-id-3817' size-in-bits='64' id='type-id-3818'/>
+    <qualified-type-def type-id='type-id-3818' const='yes' id='type-id-3819'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3820'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3821'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3811' size-in-bits='64' id='type-id-3823'/>
     <qualified-type-def type-id='type-id-3824' volatile='yes' id='type-id-3653'/>
     <qualified-type-def type-id='type-id-3825' volatile='yes' id='type-id-3656'/>
     <pointer-type-def type-id='type-id-3826' size-in-bits='64' id='type-id-3827'/>
@@ -25906,7 +25906,7 @@
           <typedef-decl name='reference' type-id='type-id-3862' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3861'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1475' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1473' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -25948,10 +25948,10 @@
           <typedef-decl name='const_reference' type-id='type-id-386' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3864'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3865'/>
+          <typedef-decl name='pointer' type-id='type-id-1464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3865'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3866'/>
+          <typedef-decl name='reference' type-id='type-id-1462' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3866'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26018,7 +26018,7 @@
         <member-function access='public'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_'>
             <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -26039,7 +26039,7 @@
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_'>
             <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <parameter type-id='type-id-400'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -26129,7 +26129,7 @@
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_'>
             <parameter type-id='type-id-3678' is-artificial='yes'/>
             <parameter type-id='type-id-3696'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-676'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -26137,7 +26137,7 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_'>
             <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -26153,7 +26153,7 @@
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2860'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3886'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3819' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3818' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_bound_args' type-id='type-id-3640' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
@@ -26175,7 +26175,7 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_'>
             <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-3823'/>
+            <parameter type-id='type-id-3822'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-3675'/>
             <return type-id='type-id-2675'/>
@@ -26200,7 +26200,7 @@
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2857'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3887'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3813' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3812' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_bound_args' type-id='type-id-3637' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
@@ -26222,7 +26222,7 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_'>
             <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-3817'/>
+            <parameter type-id='type-id-3816'/>
             <parameter type-id='type-id-676'/>
             <parameter type-id='type-id-3675'/>
             <parameter type-id='type-id-3667'/>
@@ -26276,8 +26276,8 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_'>
             <parameter type-id='type-id-3560' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1498'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -26401,13 +26401,13 @@
       </class-decl>
       <class-decl name='move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-3624'>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-1475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-3897'/>
+          <typedef-decl name='iterator_type' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-3897'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='reference' type-id='type-id-3758' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-3898'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1475' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='950' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1473' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='950' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='move_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26482,7 +26482,7 @@
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
             <parameter type-id='type-id-3795' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -26512,7 +26512,7 @@
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -26534,7 +26534,7 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_vEEOT_OT0_'>
             <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-676'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -26911,15 +26911,15 @@
       <class-decl name='_Destroy_aux&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='96' column='1' id='type-id-3913'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_'>
-            <parameter type-id='type-id-1475'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1473'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::executor::RemoteCommandRequest *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor20RemoteCommandRequestEEEvT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor20RemoteCommandRequestEEEvT_S6_'>
-            <parameter type-id='type-id-1466'/>
-            <parameter type-id='type-id-1466'/>
+            <parameter type-id='type-id-1464'/>
+            <parameter type-id='type-id-1464'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -26972,7 +26972,7 @@
       </class-decl>
       <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3549'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1473' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1471' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -26983,7 +26983,7 @@
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_'>
             <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -27012,7 +27012,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_'>
             <parameter type-id='type-id-3686'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27071,7 +27071,7 @@
       </class-decl>
       <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3555'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1453' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1451' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -27129,16 +27129,16 @@
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3916'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_'>
-            <parameter type-id='type-id-3817'/>
-            <return type-id='type-id-3817'/>
+            <parameter type-id='type-id-3816'/>
+            <return type-id='type-id-3816'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3917'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_'>
-            <parameter type-id='type-id-3823'/>
-            <return type-id='type-id-3823'/>
+            <parameter type-id='type-id-3822'/>
+            <return type-id='type-id-3822'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27198,7 +27198,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
             <parameter type-id='type-id-3703' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
+            <parameter type-id='type-id-1471'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -27219,7 +27219,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_'>
             <parameter type-id='type-id-3701'/>
-            <return type-id='type-id-1473'/>
+            <return type-id='type-id-1471'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27238,7 +27238,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1500'/>
             <parameter type-id='type-id-676'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -27260,7 +27260,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_EvEEOT_DpOT0_'>
             <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-1503'/>
+            <parameter type-id='type-id-1501'/>
             <parameter type-id='type-id-676'/>
             <return type-id='type-id-2675'/>
           </function-decl>
@@ -27274,7 +27274,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERS6_'>
             <parameter type-id='type-id-3704'/>
-            <return type-id='type-id-1503'/>
+            <return type-id='type-id-1501'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27897,8 +27897,8 @@
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_'>
             <parameter type-id='type-id-3624'/>
             <parameter type-id='type-id-3624'/>
-            <parameter type-id='type-id-1475'/>
-            <return type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
+            <return type-id='type-id-1473'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -27952,7 +27952,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_'>
             <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <parameter type-id='type-id-400'/>
             <return type-id='type-id-3945'/>
           </function-decl>
@@ -27960,7 +27960,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_'>
             <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -27975,7 +27975,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_'>
             <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <return type-id='type-id-3946'/>
           </function-decl>
         </member-function>
@@ -28002,7 +28002,7 @@
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_'>
             <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-1473'/>
             <parameter type-id='type-id-400'/>
             <return type-id='type-id-3945'/>
           </function-decl>
@@ -28019,10 +28019,10 @@
       </class-decl>
       <class-decl name='iterator_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-3948'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3860'/>
+          <typedef-decl name='pointer' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3860'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3862'/>
+          <typedef-decl name='reference' type-id='type-id-1471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3862'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='value_type' type-id='type-id-398' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3650'/>
@@ -28052,7 +28052,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3955'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1453' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3759'/>
+          <typedef-decl name='type' type-id='type-id-1451' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3759'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3956'>
@@ -28117,12 +28117,12 @@
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3971'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3813' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3787'/>
+          <typedef-decl name='type' type-id='type-id-3812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3787'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3972'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3819' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3789'/>
+          <typedef-decl name='type' type-id='type-id-3818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3789'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3973'>
@@ -28149,12 +28149,12 @@
       <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3841'/>
       <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3843'/>
       <function-decl name='__addressof&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt11__addressofIN5mongo8executor20RemoteCommandRequestEEPT_RS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo8executor20RemoteCommandRequestEEPT_RS3_'>
-        <parameter type-id='type-id-1464' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1466'/>
+        <parameter type-id='type-id-1462' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1464'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt11__addressofIN5mongo8executor12TaskExecutor14CallbackHandleEEPT_RS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo8executor12TaskExecutor14CallbackHandleEEPT_RS4_'>
-        <parameter type-id='type-id-1473' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1475'/>
+        <parameter type-id='type-id-1471' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1473'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE'>
         <parameter type-id='type-id-3760' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
@@ -28172,12 +28172,12 @@
         <parameter type-id='type-id-3762' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
         <return type-id='type-id-3675'/>
       </function-decl>
-      <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE'>
-        <parameter type-id='type-id-3786' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3812'/>
-      </function-decl>
       <function-decl name='forward&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_E4typeE'>
         <parameter type-id='type-id-3791' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3822'/>
+      </function-decl>
+      <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE'>
+        <parameter type-id='type-id-3786' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
         <return type-id='type-id-3823'/>
       </function-decl>
       <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_E4typeE'>
@@ -28228,11 +28228,11 @@
         <return type-id='type-id-3784'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-3816' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-3815' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-3788'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-3822' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <parameter type-id='type-id-3821' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
         <return type-id='type-id-3790'/>
       </function-decl>
       <function-decl name='for_each&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &gt;' mangled-name='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_'>
@@ -28247,37 +28247,37 @@
         <return type-id='type-id-1335'/>
       </function-decl>
       <function-decl name='_Construct&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_'>
-        <parameter type-id='type-id-1475' name='__p' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
-        <parameter type-id='type-id-1474' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
+        <parameter type-id='type-id-1473' name='__p' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
+        <parameter type-id='type-id-1472' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt8_DestroyIN5mongo8executor20RemoteCommandRequestEEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIN5mongo8executor20RemoteCommandRequestEEvPT_'>
-        <parameter type-id='type-id-1466' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
+        <parameter type-id='type-id-1464' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt8_DestroyIN5mongo8executor12TaskExecutor14CallbackHandleEEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIN5mongo8executor12TaskExecutor14CallbackHandleEEvPT_'>
-        <parameter type-id='type-id-1475' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
+        <parameter type-id='type-id-1473' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_'>
-        <parameter type-id='type-id-1466' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <parameter type-id='type-id-1466' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1464' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1464' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_'>
-        <parameter type-id='type-id-1475' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <parameter type-id='type-id-1475' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E'>
-        <parameter type-id='type-id-1466' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-1466' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1464' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1464' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
         <parameter type-id='type-id-3747' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E'>
-        <parameter type-id='type-id-1475' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-1475' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
         <parameter type-id='type-id-3749' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
         <return type-id='type-id-2675'/>
       </function-decl>
@@ -28292,47 +28292,47 @@
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_'>
-        <parameter type-id='type-id-1475' name='__i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
+        <parameter type-id='type-id-1473' name='__i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
         <return type-id='type-id-3624'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_'>
         <parameter type-id='type-id-3624' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
         <parameter type-id='type-id-3624' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-1475' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
-        <return type-id='type-id-1475'/>
+        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
+        <return type-id='type-id-1473'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E'>
         <parameter type-id='type-id-3624' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
         <parameter type-id='type-id-3624' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-1475' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
+        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
         <parameter type-id='type-id-3749' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
-        <return type-id='type-id-1475'/>
+        <return type-id='type-id-1473'/>
       </function-decl>
       <function-decl name='__uninitialized_move_if_noexcept_a&lt;mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle *, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' mangled-name='_ZSt34__uninitialized_move_if_noexcept_aIPN5mongo8executor12TaskExecutor14CallbackHandleES4_SaIS3_EET0_T_S7_S6_RT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt34__uninitialized_move_if_noexcept_aIPN5mongo8executor12TaskExecutor14CallbackHandleES4_SaIS3_EET0_T_S7_S6_RT1_'>
-        <parameter type-id='type-id-1475' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1'/>
-        <parameter type-id='type-id-1475' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='296' column='1'/>
-        <parameter type-id='type-id-1475' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='297' column='1'/>
+        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1'/>
+        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='296' column='1'/>
+        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='297' column='1'/>
         <parameter type-id='type-id-3749' name='__alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='298' column='1'/>
-        <return type-id='type-id-1475'/>
+        <return type-id='type-id-1473'/>
       </function-decl>
       <typedef-decl name='string' type-id='type-id-3232' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-3328'/>
       <namespace-decl name='chrono'>
       </namespace-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_'>
-        <parameter type-id='type-id-3812' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-3823' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-3675' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-3667' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-3767'/>
       </function-decl>
       <function-decl name='bind&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_'>
-        <parameter type-id='type-id-3823' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-3822' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-3675' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-3765'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_'>
-        <parameter type-id='type-id-1503' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1501' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
         <return type-id='type-id-3763'/>
       </function-decl>
@@ -28413,7 +28413,7 @@
         <return type-id='type-id-3628'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_'>
-        <parameter type-id='type-id-1473' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
         <return type-id='type-id-3631'/>
       </function-decl>
     </namespace-decl>
@@ -28426,7 +28426,7 @@
           <var-decl name='obj_' type-id='type-id-3670' visibility='default' filepath='src/mongo/util/scopeguard.h' line='294' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
-          <var-decl name='p1_' type-id='type-id-1501' visibility='default' filepath='src/mongo/util/scopeguard.h' line='296' column='1'/>
+          <var-decl name='p1_' type-id='type-id-1499' visibility='default' filepath='src/mongo/util/scopeguard.h' line='296' column='1'/>
         </data-member>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev' filepath='src/mongo/util/scopeguard.h' line='283' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev'>
@@ -28438,7 +28438,7 @@
           <function-decl name='ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_'>
             <parameter type-id='type-id-3661' is-artificial='yes'/>
             <parameter type-id='type-id-3670'/>
-            <parameter type-id='type-id-1500'/>
+            <parameter type-id='type-id-1498'/>
             <return type-id='type-id-2675'/>
           </function-decl>
         </member-function>
@@ -28451,7 +28451,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='MakeObjGuard' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_'>
             <parameter type-id='type-id-3670'/>
-            <parameter type-id='type-id-1500'/>
+            <parameter type-id='type-id-1498'/>
             <return type-id='type-id-3659'/>
           </function-decl>
         </member-function>
@@ -28539,14 +28539,14 @@
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE'>
               <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1500'/>
+              <parameter type-id='type-id-1498'/>
               <return type-id='type-id-354'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='start' mangled-name='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE'>
               <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1500'/>
+              <parameter type-id='type-id-1498'/>
               <parameter type-id='type-id-1135'/>
               <return type-id='type-id-365'/>
             </function-decl>
@@ -28554,7 +28554,7 @@
           <member-function access='private'>
             <function-decl name='_signalSufficientResponsesReceived' mangled-name='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE'>
               <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1500'/>
+              <parameter type-id='type-id-1498'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -28568,7 +28568,7 @@
           <member-function access='public'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE'>
               <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1500'/>
+              <parameter type-id='type-id-1498'/>
               <return type-id='type-id-2675'/>
             </function-decl>
           </member-function>
@@ -28591,7 +28591,7 @@
       </function-decl>
       <function-decl name='MakeGuard&lt;void, mongo::repl::ScatterGatherRunner, mongo::repl::ScatterGatherRunner, mongo::repl::ReplicationExecutor *, mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_' filepath='src/mongo/util/scopeguard.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_'>
         <parameter type-id='type-id-3671' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
-        <parameter type-id='type-id-1500' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
+        <parameter type-id='type-id-1498' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
         <return type-id='type-id-3659'/>
       </function-decl>
     </namespace-decl>
@@ -28611,10 +28611,10 @@
     <function-type size-in-bits='64' id='type-id-3811'>
       <parameter type-id='type-id-394'/>
       <parameter type-id='type-id-3671'/>
-      <parameter type-id='type-id-1453'/>
+      <parameter type-id='type-id-1451'/>
       <return type-id='type-id-2675'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3818'>
+    <function-type size-in-bits='64' id='type-id-3817'>
       <parameter type-id='type-id-408'/>
       <parameter type-id='type-id-3671'/>
       <return type-id='type-id-2675'/>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index a8a6ab4f..b3888eaf 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -855,22 +855,22 @@
     <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-decl name='dbus_int32_t' type-id='type-id-2' filepath='../dbus/dbus-arch-deps.h' line='42' column='1' id='type-id-98'/>
     <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-60'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-80'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-37'/>
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-99'/>
-    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
-    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-101'/>
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-103'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
-    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-80'/>
-    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-76'/>
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-74'/>
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-70'/>
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-102'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-103'/>
+    <pointer-type-def type-id='type-id-96' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
+    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-107'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-76'/>
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-74'/>
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-113'/>
     <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-114'/>
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-79'/>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-83'/>
@@ -910,7 +910,7 @@
         <var-decl name='reply' type-id='type-id-37' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <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'>
         <var-decl name='timeout_link' type-id='type-id-5' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='74' column='1'/>
@@ -1045,16 +1045,16 @@
     </function-decl>
     <function-decl name='dbus_connection_preallocate_send' mangled-name='dbus_connection_preallocate_send' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3165' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_preallocate_send'>
       <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'/>
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='dbus_connection_send_preallocated' mangled-name='dbus_connection_send_preallocated' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_send_preallocated'>
       <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 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 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 type-id='type-id-32' name='client_serial' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3220' column='1'/>
       <return type-id='type-id-24'/>
@@ -1068,7 +1068,7 @@
     <function-decl name='dbus_connection_send_with_reply' mangled-name='dbus_connection_send_with_reply' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='3399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_send_with_reply'>
       <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='3399' column='1'/>
       <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 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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
@@ -1174,7 +1174,7 @@
     <function-decl name='dbus_connection_get_adt_audit_session_data' mangled-name='dbus_connection_get_adt_audit_session_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_get_adt_audit_session_data'>
       <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='5259' column='1'/>
       <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='dbus_connection_set_unix_user_function' mangled-name='dbus_connection_set_unix_user_function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_set_unix_user_function'>
@@ -1186,7 +1186,7 @@
     </function-decl>
     <function-decl name='dbus_connection_get_windows_user' mangled-name='dbus_connection_get_windows_user' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_get_windows_user'>
       <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='dbus_connection_set_windows_user_function' mangled-name='dbus_connection_set_windows_user_function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_set_windows_user_function'>
@@ -1222,7 +1222,7 @@
     <function-decl name='dbus_connection_try_register_object_path' mangled-name='dbus_connection_try_register_object_path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_try_register_object_path'>
       <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='5672' column='1'/>
       <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 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 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 type-id='type-id-20' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5676' column='1'/>
       <return type-id='type-id-16'/>
@@ -1230,14 +1230,14 @@
     <function-decl name='dbus_connection_register_object_path' mangled-name='dbus_connection_register_object_path' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_register_object_path'>
       <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='5702' column='1'/>
       <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 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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='dbus_connection_try_register_fallback' mangled-name='dbus_connection_try_register_fallback' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_try_register_fallback'>
       <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='5742' column='1'/>
       <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 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 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 type-id='type-id-20' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5746' column='1'/>
       <return type-id='type-id-16'/>
@@ -1245,7 +1245,7 @@
     <function-decl name='dbus_connection_register_fallback' mangled-name='dbus_connection_register_fallback' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_register_fallback'>
       <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='5774' column='1'/>
       <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 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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
@@ -1263,15 +1263,15 @@
     <function-decl name='dbus_connection_list_registered' mangled-name='dbus_connection_list_registered' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_list_registered'>
       <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='5878' column='1'/>
       <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='dbus_connection_set_data' mangled-name='dbus_connection_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-connection.c' line='5968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_connection_set_data'>
@@ -1339,31 +1339,31 @@
     <typedef-decl name='DBusTimeoutList' type-id='type-id-138' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.h' line='38' column='1' id='type-id-127'/>
     <typedef-decl name='DBusTransport' type-id='type-id-139' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-transport.h' line='33' column='1' id='type-id-128'/>
     <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'/>
-    <function-type size-in-bits='64' id='type-id-109'>
+    <function-type size-in-bits='64' id='type-id-99'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-53'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-110'>
+    <function-type size-in-bits='64' id='type-id-109'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-7'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-16'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-111'>
+    <function-type size-in-bits='64' id='type-id-110'>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-16'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-112'>
-      <parameter type-id='type-id-102'/>
+    <function-type size-in-bits='64' id='type-id-111'>
+      <parameter type-id='type-id-103'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-16'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-113'>
-      <parameter type-id='type-id-103'/>
+    <function-type size-in-bits='64' id='type-id-112'>
+      <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-16'/>
     </function-type>
@@ -1379,12 +1379,12 @@
       <return type-id='type-id-24'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-117'>
-      <parameter type-id='type-id-102'/>
+      <parameter type-id='type-id-103'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-24'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-118'>
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-24'/>
     </function-type>
@@ -1453,7 +1453,7 @@
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='dbus_shutdown' mangled-name='dbus_shutdown' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-memory.c' line='890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_shutdown'>
@@ -1736,7 +1736,7 @@
     </function-decl>
     <function-decl name='dbus_message_get_path_decomposed' mangled-name='dbus_message_get_path_decomposed' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_get_path_decomposed'>
       <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='dbus_message_set_interface' mangled-name='dbus_message_set_interface' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='3198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_interface'>
@@ -1840,11 +1840,11 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='dbus_message_set_data' mangled-name='dbus_message_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4599' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_set_data'>
@@ -1869,7 +1869,7 @@
     </function-decl>
     <function-decl name='dbus_message_marshal' mangled-name='dbus_message_marshal' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-message.c' line='4721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_message_marshal'>
       <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 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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
@@ -1914,7 +1914,7 @@
         <var-decl name='reply' type-id='type-id-37' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <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'>
         <var-decl name='timeout_link' type-id='type-id-5' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='74' column='1'/>
@@ -1932,58 +1932,58 @@
     <typedef-decl name='DBusPendingCallNotifyFunction' type-id='type-id-153' filepath='../dbus/dbus-connection.h' line='162' column='1' id='type-id-135'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-153'/>
     <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 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'/>
-      <return type-id='type-id-99'/>
+      <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'/>
+      <return type-id='type-id-100'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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 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 type-id='type-id-9' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='624' column='1'/>
       <parameter type-id='type-id-45' name='free_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='625' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-37'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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 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 type-id='type-id-9' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='803' column='1'/>
       <parameter type-id='type-id-45' name='free_data_func' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-pending-call.c' line='804' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-154'>
-      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-100'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-24'/>
     </function-type>
@@ -2039,7 +2039,7 @@
         <var-decl name='new_connection_free_data_function' type-id='type-id-45' visibility='default' filepath='../dbus/dbus-server-protected.h' line='80' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <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'>
         <var-decl name='disconnected' type-id='type-id-8' visibility='default' filepath='../dbus/dbus-server-protected.h' line='87' column='1'/>
@@ -2143,11 +2143,11 @@
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <function-decl name='dbus_server_set_data' mangled-name='dbus_server_set_data' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-server.c' line='1116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_server_set_data'>
@@ -2368,10 +2368,10 @@
     <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
     <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-208'/>
     <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-210'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-204'/>
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-205'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-207'/>
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-209'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-209'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-204'/>
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-223'/>
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
     <class-decl name='DBusCondVar' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-226'/>
@@ -2402,19 +2402,19 @@
       <return type-id='type-id-16'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-218'>
+      <parameter type-id='type-id-223'/>
       <return type-id='type-id-24'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-219'>
       <parameter type-id='type-id-223'/>
+      <parameter type-id='type-id-225'/>
       <return type-id='type-id-24'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-220'>
-      <parameter type-id='type-id-223'/>
       <parameter type-id='type-id-225'/>
       <return type-id='type-id-24'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-221'>
-      <parameter type-id='type-id-225'/>
       <return type-id='type-id-24'/>
     </function-type>
   </abi-instr>
@@ -2448,25 +2448,25 @@
     <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'/>
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-228'/>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <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 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 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 type-id='type-id-45' name='free_data_function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-timeout.c' line='448' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-229'>
@@ -2477,13 +2477,13 @@
   <abi-instr address-size='64' path='dbus-uuidgen.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus' language='LANG_C89'>
     <function-decl name='dbus_internal_do_not_use_get_uuid' mangled-name='dbus_internal_do_not_use_get_uuid' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_internal_do_not_use_get_uuid'>
       <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 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 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 type-id='type-id-20' name='error' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-uuidgen.c' line='86' column='1'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
   </abi-instr>
@@ -2523,42 +2523,42 @@
     <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'/>
     <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-230'/>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='dbus_watch_get_flags' mangled-name='dbus_watch_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dbus_watch_get_flags'>
-      <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'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <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 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 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 type-id='type-id-45' name='free_data_function' filepath='/tmp/legendre/spack-stage/spack-stage-hI99PR/dbus-1.9.0/dbus/dbus-watch.c' line='644' column='1'/>
       <return type-id='type-id-24'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <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 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 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'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-231'>
-      <parameter type-id='type-id-103'/>
+      <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-16'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index a1051a45..4ab5abc9 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -10738,10 +10738,10 @@
     <typedef-decl name='Real' type-id='type-id-27' filepath='libnurbs/nurbtess/definitions.h' line='36' column='1' id='type-id-282'/>
     <typedef-decl name='Real2' type-id='type-id-283' filepath='libnurbs/nurbtess/definitions.h' line='38' column='1' id='type-id-295'/>
     <pointer-type-def type-id='type-id-287' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-286'/>
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-292'/>
     <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-289'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-294'/>
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-187'/>
     <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-290'/>
     <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-293'/>
@@ -14617,10 +14617,10 @@
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-416'/>
     <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-383'/>
     <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-401'/>
-    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-399'/>
-    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-400'/>
-    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-402'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-400'/>
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-402'/>
+    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-399'/>
+    <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-404'/>
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-11'/>
     <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-14'/>
     <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-15'/>
@@ -14712,14 +14712,14 @@
       <parameter type-id='type-id-396'/>
       <return type-id='type-id-19'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-436'>
+    <function-type size-in-bits='64' id='type-id-438'>
       <parameter type-id='type-id-441'/>
       <parameter type-id='type-id-184'/>
       <parameter type-id='type-id-50'/>
       <parameter type-id='type-id-184'/>
       <return type-id='type-id-19'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-437'>
+    <function-type size-in-bits='64' id='type-id-439'>
       <parameter type-id='type-id-441'/>
       <parameter type-id='type-id-184'/>
       <parameter type-id='type-id-50'/>
@@ -14727,11 +14727,11 @@
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-19'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-438'>
+    <function-type size-in-bits='64' id='type-id-436'>
       <parameter type-id='type-id-49'/>
       <return type-id='type-id-19'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-439'>
+    <function-type size-in-bits='64' id='type-id-437'>
       <parameter type-id='type-id-49'/>
       <parameter type-id='type-id-17'/>
       <return type-id='type-id-19'/>
@@ -14952,8 +14952,8 @@
     <typedef-decl name='GLboolean' type-id='type-id-443' filepath='../../../include/GL/gl.h' line='150' column='1' id='type-id-49'/>
     <typedef-decl name='_GLUfuncptr' type-id='type-id-12' filepath='../../../include/GL/glu.h' line='287' column='1' id='type-id-22'/>
     <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-12'/>
     <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'>
       <return type-id='type-id-457'/>
     </function-decl>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index fc9243f8..739e5931 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -2990,9 +2990,6 @@
       <return type-id='type-id-112'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-160'>
-      <return type-id='type-id-27'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-161'>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-4'/>
@@ -3000,6 +2997,9 @@
       <parameter type-id='type-id-116'/>
       <return type-id='type-id-27'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-161'>
+      <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-decl name='__sanitizer'>
@@ -6819,266 +6819,265 @@
     <type-decl name='wchar_t' size-in-bits='32' id='type-id-927'/>
     <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-374'/>
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-928'/>
+    <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-878'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-909'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-911'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-913'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-476'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-585'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-623'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-625'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-627'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-937'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-548'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-569'/>
+    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-762'/>
+    <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-681'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-770'/>
+    <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-744'/>
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-752'/>
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-678'/>
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-377'/>
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-388'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-190'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-930'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-932'/>
-    <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-189'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-939'/>
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-941'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-945'/>
     <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
     <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
-    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-953'/>
-    <pointer-type-def type-id='type-id-954' size-in-bits='64' id='type-id-758'/>
-    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-955'/>
+    <reference-type-def kind='lvalue' type-id='type-id-950' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-954'/>
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
     <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-958'/>
-    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-754'/>
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-960'/>
-    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-961'/>
-    <pointer-type-def type-id='type-id-962' size-in-bits='64' id='type-id-963'/>
-    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-502'/>
-    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-504'/>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-560'/>
-    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-556'/>
-    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-564'/>
-    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-552'/>
-    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-964'/>
+    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-966'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-969' size-in-bits='64' id='type-id-888'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-971'/>
+    <pointer-type-def type-id='type-id-972' size-in-bits='64' id='type-id-758'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-973'/>
     <pointer-type-def type-id='type-id-973' size-in-bits='64' id='type-id-974'/>
     <pointer-type-def type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
-    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-977'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-754'/>
+    <pointer-type-def type-id='type-id-976' size-in-bits='64' id='type-id-978'/>
     <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
-    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-980'/>
-    <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-982'/>
-    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-571'/>
-    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-573'/>
-    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-986'/>
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-990'/>
-    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-991'/>
-    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-993'/>
-    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-581'/>
-    <pointer-type-def type-id='type-id-995' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-981'/>
+    <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-502'/>
+    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-504'/>
+    <pointer-type-def type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-560'/>
+    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-556'/>
+    <pointer-type-def type-id='type-id-988' size-in-bits='64' id='type-id-564'/>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-552'/>
+    <pointer-type-def type-id='type-id-985' size-in-bits='64' id='type-id-990'/>
+    <pointer-type-def type-id='type-id-991' size-in-bits='64' id='type-id-992'/>
+    <pointer-type-def type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
+    <pointer-type-def type-id='type-id-994' size-in-bits='64' id='type-id-995'/>
     <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
-    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-999'/>
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1000'/>
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1001'/>
+    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-998'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-571'/>
+    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-573'/>
+    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1004'/>
+    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
+    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
+    <pointer-type-def type-id='type-id-404' size-in-bits='64' id='type-id-1009'/>
+    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-581'/>
+    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-583'/>
+    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-1015'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-1018'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-1019'/>
+    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-866'/>
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-739'/>
+    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-621'/>
+    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-522'/>
     <qualified-type-def type-id='type-id-354' const='yes' id='type-id-376'/>
-    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-510'/>
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-512'/>
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-1005' size-in-bits='64' id='type-id-456'/>
-    <pointer-type-def type-id='type-id-1006' size-in-bits='64' id='type-id-890'/>
-    <pointer-type-def type-id='type-id-1007' size-in-bits='64' id='type-id-883'/>
-    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-873'/>
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-871'/>
-    <pointer-type-def type-id='type-id-1010' size-in-bits='64' id='type-id-860'/>
-    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-856'/>
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-546'/>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-467'/>
-    <pointer-type-def type-id='type-id-1014' size-in-bits='64' id='type-id-766'/>
-    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-542'/>
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-810'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-864'/>
-    <pointer-type-def type-id='type-id-1018' size-in-bits='64' id='type-id-589'/>
-    <pointer-type-def type-id='type-id-1019' size-in-bits='64' id='type-id-482'/>
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1021'/>
-    <pointer-type-def type-id='type-id-1022' size-in-bits='64' id='type-id-462'/>
-    <qualified-type-def type-id='type-id-929' const='yes' id='type-id-1023'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1023' size-in-bits='64' id='type-id-1024'/>
-    <pointer-type-def type-id='type-id-1023' size-in-bits='64' id='type-id-1025'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1026'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1026' size-in-bits='64' id='type-id-1027'/>
-    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-1028'/>
-    <qualified-type-def type-id='type-id-933' const='yes' id='type-id-1029'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1029' size-in-bits='64' id='type-id-1030'/>
-    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-1031'/>
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1032'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-1033'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-1034'/>
-    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1035'/>
-    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-1036'/>
-    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-1037'/>
-    <qualified-type-def type-id='type-id-957' const='yes' id='type-id-1038'/>
-    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-1039'/>
-    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-1040'/>
-    <qualified-type-def type-id='type-id-978' const='yes' id='type-id-1041'/>
-    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
-    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1043'/>
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-1044'/>
-    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-876'/>
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1046'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-392'/>
-    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1047'/>
-    <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-391'/>
-    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1048'/>
-    <qualified-type-def type-id='type-id-1049' const='yes' id='type-id-1050'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1050' size-in-bits='64' id='type-id-1051'/>
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-234'/>
-    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1054'/>
-    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
-    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-1056'/>
-    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-600'/>
-    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-647'/>
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-772'/>
-    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-527'/>
-    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1061'/>
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-603'/>
-    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-649'/>
-    <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-774'/>
-    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-529'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1066'/>
-    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-654'/>
-    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-566'/>
-    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-670'/>
-    <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-674'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-815'/>
-    <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-831'/>
-    <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-833'/>
-    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-829'/>
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-778'/>
-    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-788'/>
-    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-782'/>
-    <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-506'/>
-    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-508'/>
-    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-562'/>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-915'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-558'/>
-    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-592'/>
-    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-849'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-790'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-786'/>
-    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-784'/>
-    <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-780'/>
-    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-827'/>
-    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-741'/>
-    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-854'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-868'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-432'/>
-    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-426'/>
-    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-479'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-661'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-430'/>
-    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-424'/>
-    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-587'/>
-    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-415'/>
-    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-668'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-900'/>
-    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-824'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-550'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-443'/>
-    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-436'/>
-    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-491'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-907'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-902'/>
-    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-493'/>
-    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-844'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-498'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-578'/>
-    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-419'/>
-    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-905'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-813'/>
-    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-793'/>
-    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-596'/>
-    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-676'/>
-    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-534'/>
-    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-821'/>
-    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-576'/>
-    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-500'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-464'/>
-    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-450'/>
-    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-807'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-471'/>
-    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-732'/>
-    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-709'/>
-    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-894'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-515'/>
-    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-458'/>
-    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-659'/>
-    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-510'/>
+    <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-1026' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-1027' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-890'/>
+    <pointer-type-def type-id='type-id-1029' size-in-bits='64' id='type-id-546'/>
+    <pointer-type-def type-id='type-id-1030' size-in-bits='64' id='type-id-883'/>
+    <pointer-type-def type-id='type-id-1031' size-in-bits='64' id='type-id-873'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-871'/>
+    <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-860'/>
+    <pointer-type-def type-id='type-id-1034' size-in-bits='64' id='type-id-856'/>
+    <pointer-type-def type-id='type-id-1035' size-in-bits='64' id='type-id-467'/>
+    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-766'/>
+    <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-542'/>
+    <pointer-type-def type-id='type-id-1038' size-in-bits='64' id='type-id-810'/>
+    <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-864'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-589'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-1043'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-462'/>
+    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1045'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1047'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-1049'/>
+    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-1050'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
+    <pointer-type-def type-id='type-id-1051' size-in-bits='64' id='type-id-1053'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1054'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
+    <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1056'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-1057'/>
+    <pointer-type-def type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
+    <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1060'/>
+    <pointer-type-def type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1061' size-in-bits='64' id='type-id-1062'/>
+    <qualified-type-def type-id='type-id-996' const='yes' id='type-id-1063'/>
+    <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
+    <qualified-type-def type-id='type-id-404' const='yes' id='type-id-1065'/>
+    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-1066'/>
+    <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-876'/>
+    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-1068'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-392'/>
+    <qualified-type-def type-id='type-id-390' const='yes' id='type-id-1069'/>
+    <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-391'/>
+    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-1070'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
+    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-234'/>
+    <qualified-type-def type-id='type-id-927' const='yes' id='type-id-1076'/>
+    <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1078'/>
+    <pointer-type-def type-id='type-id-1079' size-in-bits='64' id='type-id-600'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-772'/>
+    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-527'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1083'/>
+    <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-603'/>
+    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-649'/>
+    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-774'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-529'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-1088'/>
+    <pointer-type-def type-id='type-id-1089' size-in-bits='64' id='type-id-566'/>
+    <pointer-type-def type-id='type-id-1090' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-1091' size-in-bits='64' id='type-id-674'/>
+    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-815'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-831'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-833'/>
+    <pointer-type-def type-id='type-id-1095' size-in-bits='64' id='type-id-829'/>
+    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-471'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-732'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-778'/>
+    <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-788'/>
+    <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-782'/>
+    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-506'/>
+    <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-562'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-915'/>
+    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-592'/>
+    <pointer-type-def type-id='type-id-1107' size-in-bits='64' id='type-id-558'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-849'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-790'/>
+    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-786'/>
+    <pointer-type-def type-id='type-id-1111' size-in-bits='64' id='type-id-784'/>
+    <pointer-type-def type-id='type-id-1112' size-in-bits='64' id='type-id-780'/>
+    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-827'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-741'/>
+    <pointer-type-def type-id='type-id-1115' size-in-bits='64' id='type-id-424'/>
+    <pointer-type-def type-id='type-id-1116' size-in-bits='64' id='type-id-854'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-426'/>
+    <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-868'/>
+    <pointer-type-def type-id='type-id-1119' size-in-bits='64' id='type-id-432'/>
+    <pointer-type-def type-id='type-id-1120' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-661'/>
+    <pointer-type-def type-id='type-id-1122' size-in-bits='64' id='type-id-430'/>
+    <pointer-type-def type-id='type-id-1123' size-in-bits='64' id='type-id-587'/>
+    <pointer-type-def type-id='type-id-1124' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-1126' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-1127' size-in-bits='64' id='type-id-900'/>
+    <pointer-type-def type-id='type-id-1128' size-in-bits='64' id='type-id-793'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-824'/>
+    <pointer-type-def type-id='type-id-1130' size-in-bits='64' id='type-id-550'/>
+    <pointer-type-def type-id='type-id-1131' size-in-bits='64' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-1132' size-in-bits='64' id='type-id-436'/>
+    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-491'/>
+    <pointer-type-def type-id='type-id-1134' size-in-bits='64' id='type-id-907'/>
+    <pointer-type-def type-id='type-id-1135' size-in-bits='64' id='type-id-902'/>
+    <pointer-type-def type-id='type-id-1136' size-in-bits='64' id='type-id-493'/>
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-844'/>
+    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-498'/>
+    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-578'/>
+    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-419'/>
+    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-905'/>
+    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-813'/>
+    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-596'/>
+    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-676'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-534'/>
+    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-821'/>
+    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-576'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-464'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-452'/>
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-450'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-807'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-894'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-515'/>
+    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-659'/>
+    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-458'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-654'/>
     <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-441'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-1138' size-in-bits='64' id='type-id-672'/>
-    <pointer-type-def type-id='type-id-1139' size-in-bits='64' id='type-id-760'/>
-    <pointer-type-def type-id='type-id-1140' size-in-bits='64' id='type-id-756'/>
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-750'/>
-    <pointer-type-def type-id='type-id-1142' size-in-bits='64' id='type-id-428'/>
-    <pointer-type-def type-id='type-id-1143' size-in-bits='64' id='type-id-422'/>
-    <pointer-type-def type-id='type-id-1144' size-in-bits='64' id='type-id-489'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-713'/>
-    <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-796'/>
-    <pointer-type-def type-id='type-id-1147' size-in-bits='64' id='type-id-554'/>
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-798'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-615'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-684'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-640'/>
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-656'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-672'/>
+    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-460'/>
+    <pointer-type-def type-id='type-id-1161' size-in-bits='64' id='type-id-684'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-760'/>
+    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-756'/>
+    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-750'/>
+    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-640'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-422'/>
+    <pointer-type-def type-id='type-id-1167' size-in-bits='64' id='type-id-428'/>
+    <pointer-type-def type-id='type-id-1168' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-796'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-554'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-798'/>
+    <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-615'/>
+    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-721'/>
     <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-12'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-711'/>
-    <pointer-type-def type-id='type-id-1155' size-in-bits='64' id='type-id-692'/>
-    <pointer-type-def type-id='type-id-1156' size-in-bits='64' id='type-id-632'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-696'/>
-    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-706'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-703'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1161'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1162'/>
-    <pointer-type-def type-id='type-id-1163' size-in-bits='64' id='type-id-606'/>
-    <pointer-type-def type-id='type-id-1164' size-in-bits='64' id='type-id-531'/>
-    <pointer-type-def type-id='type-id-1165' size-in-bits='64' id='type-id-651'/>
-    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-776'/>
-    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1167'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1168'/>
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-711'/>
+    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-692'/>
+    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1184'/>
+    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-606'/>
+    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-531'/>
+    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-651'/>
+    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-776'/>
+    <pointer-type-def type-id='type-id-383' size-in-bits='64' id='type-id-1189'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-1190'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-805'/>
+    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-768'/>
+    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1193'/>
     <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-398'/>
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1170'/>
-    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1171'/>
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1172'/>
-    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1173'/>
-    <pointer-type-def type-id='type-id-1174' size-in-bits='64' id='type-id-878'/>
-    <pointer-type-def type-id='type-id-1175' size-in-bits='64' id='type-id-909'/>
-    <pointer-type-def type-id='type-id-1176' size-in-bits='64' id='type-id-911'/>
-    <pointer-type-def type-id='type-id-1177' size-in-bits='64' id='type-id-913'/>
-    <pointer-type-def type-id='type-id-1178' size-in-bits='64' id='type-id-476'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-585'/>
-    <pointer-type-def type-id='type-id-1180' size-in-bits='64' id='type-id-623'/>
-    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-548'/>
-    <pointer-type-def type-id='type-id-1184' size-in-bits='64' id='type-id-569'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-762'/>
-    <pointer-type-def type-id='type-id-1186' size-in-bits='64' id='type-id-681'/>
-    <pointer-type-def type-id='type-id-1187' size-in-bits='64' id='type-id-770'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-744'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-752'/>
-    <pointer-type-def type-id='type-id-1190' size-in-bits='64' id='type-id-678'/>
-    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-888'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-866'/>
-    <pointer-type-def type-id='type-id-1193' size-in-bits='64' id='type-id-739'/>
-    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-621'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-522'/>
-    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1196'/>
-    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-805'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-768'/>
-    <pointer-type-def type-id='type-id-1199' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-1194'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1195'/>
+    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-1196'/>
+    <pointer-type-def type-id='type-id-400' size-in-bits='64' id='type-id-1197'/>
+    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-819'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1199'/>
     <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-841'/>
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-178'/>
     <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-886'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-144'/>
     <pointer-type-def type-id='type-id-1202' size-in-bits='64' id='type-id-613'/>
     <pointer-type-def type-id='type-id-1203' size-in-bits='64' id='type-id-835'/>
     <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-837'/>
@@ -7086,28 +7085,29 @@
     <pointer-type-def type-id='type-id-1205' size-in-bits='64' id='type-id-403'/>
     <pointer-type-def type-id='type-id-1206' size-in-bits='64' id='type-id-1207'/>
     <pointer-type-def type-id='type-id-1208' size-in-bits='64' id='type-id-839'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-144'/>
     <pointer-type-def type-id='type-id-1209' size-in-bits='64' id='type-id-439'/>
-    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-664'/>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-519'/>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-525'/>
-    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-637'/>
-    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-487'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-619'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-619'/>
+    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-519'/>
+    <pointer-type-def type-id='type-id-1214' size-in-bits='64' id='type-id-525'/>
+    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-637'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-487'/>
     <pointer-type-def type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-630'/>
-    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-764'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-764'/>
+    <pointer-type-def type-id='type-id-1220' size-in-bits='64' id='type-id-630'/>
     <pointer-type-def type-id='type-id-1221' size-in-bits='64' id='type-id-643'/>
     <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-645'/>
     <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-634'/>
-    <qualified-type-def type-id='type-id-998' volatile='yes' id='type-id-1052'/>
-    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-236'/>
+    <qualified-type-def type-id='type-id-1016' volatile='yes' id='type-id-1074'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-236'/>
     <qualified-type-def type-id='type-id-235' volatile='yes' id='type-id-1224'/>
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-1225'/>
-    <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'/>
     <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1227'/>
     <namespace-decl name='std'>
-      <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-decl name='__interception'>
       <var-decl name='real_textdomain' type-id='type-id-885' mangled-name='_ZN14__interception15real_textdomainE' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='62' column='1'/>
@@ -7487,20 +7487,20 @@
     </function-decl>
     <function-decl name='__interceptor_readv' mangled-name='__interceptor_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readv'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='268' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-decl name='__interceptor_preadv' mangled-name='__interceptor_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <parameter type-id='type-id-411' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='284' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-decl name='__interceptor_preadv64' mangled-name='__interceptor_preadv64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_preadv64'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <parameter type-id='type-id-410' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='300' column='1'/>
       <return type-id='type-id-414'/>
@@ -7527,20 +7527,20 @@
     </function-decl>
     <function-decl name='__interceptor_writev' mangled-name='__interceptor_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_writev'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='363' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-decl name='__interceptor_pwritev' mangled-name='__interceptor_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <parameter type-id='type-id-411' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='379' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-decl name='__interceptor_pwritev64' mangled-name='__interceptor_pwritev64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pwritev64'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
-      <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 type-id='type-id-6' name='iovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <parameter type-id='type-id-410' name='offset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='395' column='1'/>
       <return type-id='type-id-414'/>
@@ -7559,21 +7559,21 @@
     </function-decl>
     <function-decl name='__interceptor_localtime' mangled-name='__interceptor_localtime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_localtime'>
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='456' column='1'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1'/>
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='466' column='1'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <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 type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='476' column='1'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1'/>
       <parameter type-id='type-id-3' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='486' column='1'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-137' name='timep' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='496' column='1'/>
@@ -7585,52 +7585,52 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <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 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 type-id='type-id-28' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='526' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_strptime' mangled-name='__interceptor_strptime' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strptime'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
       <parameter type-id='type-id-28' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='550' column='1'/>
-      <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'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_vscanf' mangled-name='__interceptor_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vscanf'>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='587' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_vsscanf' mangled-name='__interceptor_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vsscanf'>
       <parameter type-id='type-id-4' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='590' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_vfscanf' mangled-name='__interceptor_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_vfscanf'>
       <parameter type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='593' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vscanf' mangled-name='__interceptor___isoc99_vscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vscanf'>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='597' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vsscanf' mangled-name='__interceptor___isoc99_vsscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vsscanf'>
       <parameter type-id='type-id-4' name='str' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='600' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor___isoc99_vfscanf' mangled-name='__interceptor___isoc99_vfscanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor___isoc99_vfscanf'>
       <parameter type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
       <parameter type-id='type-id-4' name='format' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='604' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_scanf' mangled-name='__interceptor_scanf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scanf'>
@@ -7761,28 +7761,28 @@
     </function-decl>
     <function-decl name='__interceptor_gethostbyname' mangled-name='__interceptor_gethostbyname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1181' column='1'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-3' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <parameter type-id='type-id-6' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1189' column='1'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <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 type-id='type-id-6' name='fake' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1199' column='1'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1207' column='1'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-decl>
     <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 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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
-      <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 type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1224' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -7790,29 +7790,29 @@
       <parameter type-id='type-id-3' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-6' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-6' name='type' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
-      <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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
-      <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 type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1241' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname_r' mangled-name='__interceptor_gethostbyname_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname_r'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
-      <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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
-      <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 type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1261' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_gethostbyname2_r' mangled-name='__interceptor_gethostbyname2_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_gethostbyname2_r'>
       <parameter type-id='type-id-28' name='name' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-6' name='af' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
-      <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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <parameter type-id='type-id-412' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
-      <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 type-id='type-id-35' name='h_errnop' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1279' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
@@ -7839,22 +7839,22 @@
     </function-decl>
     <function-decl name='__interceptor_modf' mangled-name='__interceptor_modf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_modf'>
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1368' column='1'/>
-      <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'/>
       <return type-id='type-id-378'/>
     </function-decl>
     <function-decl name='__interceptor_modff' mangled-name='__interceptor_modff' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_modff'>
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1377' column='1'/>
-      <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'/>
       <return type-id='type-id-379'/>
     </function-decl>
     <function-decl name='__interceptor_modfl' mangled-name='__interceptor_modfl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_modfl'>
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1386' column='1'/>
-      <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'/>
       <return type-id='type-id-383'/>
     </function-decl>
     <function-decl name='__interceptor_recvmsg' mangled-name='__interceptor_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_recvmsg'>
       <parameter type-id='type-id-6' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
-      <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 type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1417' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
@@ -7870,22 +7870,22 @@
     </function-decl>
     <function-decl name='__interceptor_readdir' mangled-name='__interceptor_readdir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir'>
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1467' column='1'/>
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-decl>
     <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 type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
-      <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-955' name='result' 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 type-id='type-id-973' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1475' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_readdir64' mangled-name='__interceptor_readdir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_readdir64'>
       <parameter type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1496' column='1'/>
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-decl>
     <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 type-id='type-id-3' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
-      <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-960' name='result' 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 type-id='type-id-978' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1504' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_ptrace' mangled-name='__interceptor_ptrace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ptrace'>
@@ -7911,13 +7911,13 @@
     </function-decl>
     <function-decl name='__interceptor_strtoimax' mangled-name='__interceptor_strtoimax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoimax'>
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
-      <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 type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1614' column='1'/>
       <return type-id='type-id-408'/>
     </function-decl>
     <function-decl name='__interceptor_strtoumax' mangled-name='__interceptor_strtoumax' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strtoumax'>
       <parameter type-id='type-id-4' name='nptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
-      <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 type-id='type-id-6' name='base' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1622' column='1'/>
       <return type-id='type-id-408'/>
     </function-decl>
@@ -7944,20 +7944,20 @@
     </function-decl>
     <function-decl name='__interceptor_wcstombs' mangled-name='__interceptor_wcstombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcstombs'>
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
-      <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 type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1696' column='1'/>
       <return type-id='type-id-412'/>
     </function-decl>
     <function-decl name='__interceptor_wcsrtombs' mangled-name='__interceptor_wcsrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsrtombs'>
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
-      <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 type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <parameter type-id='type-id-3' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1707' column='1'/>
       <return type-id='type-id-412'/>
     </function-decl>
     <function-decl name='__interceptor_wcsnrtombs' mangled-name='__interceptor_wcsnrtombs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wcsnrtombs'>
       <parameter type-id='type-id-28' name='dest' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
-      <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 type-id='type-id-412' name='nms' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <parameter type-id='type-id-412' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
       <parameter type-id='type-id-3' name='ps' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1729' column='1'/>
@@ -8007,74 +8007,74 @@
     </function-decl>
     <function-decl name='__interceptor_scandir' mangled-name='__interceptor_scandir' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir'>
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
-      <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 type-id='type-id-791' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <parameter type-id='type-id-787' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1913' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_scandir64' mangled-name='__interceptor_scandir64' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_scandir64'>
       <parameter type-id='type-id-28' name='dirp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
-      <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 type-id='type-id-785' name='filter' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <parameter type-id='type-id-781' name='compar' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1966' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_getgroups' mangled-name='__interceptor_getgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getgroups'>
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='1996' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <parameter type-id='type-id-6' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2024' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-1228' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
       <parameter type-id='type-id-3' name='timeout_ts' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2039' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_wordexp' mangled-name='__interceptor_wordexp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_wordexp'>
       <parameter type-id='type-id-28' name='s' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
-      <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 type-id='type-id-6' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2058' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-35' name='sig' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2081' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2095' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-3' name='info' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2109' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_sigprocmask' mangled-name='__interceptor_sigprocmask' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigprocmask'>
       <parameter type-id='type-id-6' name='how' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
-      <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-991' name='oldset' 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 type-id='type-id-1009' name='oldset' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2161' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_backtrace' mangled-name='__interceptor_backtrace' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_backtrace'>
@@ -8085,7 +8085,7 @@
     <function-decl name='__interceptor_backtrace_symbols' mangled-name='__interceptor_backtrace_symbols' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_backtrace_symbols'>
       <parameter type-id='type-id-258' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
       <parameter type-id='type-id-6' name='size' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2186' column='1'/>
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-6' name='status' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2207' column='1'/>
@@ -8119,14 +8119,14 @@
     </function-decl>
     <function-decl name='__interceptor_getmntent' mangled-name='__interceptor_getmntent' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_getmntent'>
       <parameter type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2312' column='1'/>
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <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 type-id='type-id-3' name='fp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
-      <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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
       <parameter type-id='type-id-6' name='buflen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2325' column='1'/>
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-28' name='path' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2339' column='1'/>
@@ -8174,38 +8174,38 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_ether_aton' mangled-name='__interceptor_ether_aton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_aton'>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2452' column='1'/>
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <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 type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2460' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_ether_hostton' mangled-name='__interceptor_ether_hostton' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_hostton'>
       <parameter type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2469' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_ether_line' mangled-name='__interceptor_ether_line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_line'>
       <parameter type-id='type-id-28' name='line' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
-      <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 type-id='type-id-28' name='hostname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2478' column='1'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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 type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2502' column='1'/>
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='__interceptor_ether_aton_r' mangled-name='__interceptor_ether_aton_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_ether_aton_r'>
       <parameter type-id='type-id-28' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
-      <parameter type-id='type-id-963' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
-      <return type-id='type-id-963'/>
+      <parameter type-id='type-id-981' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2510' column='1'/>
+      <return type-id='type-id-981'/>
     </function-decl>
     <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'>
       <parameter type-id='type-id-6' name='shmid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2527' column='1'/>
@@ -8215,7 +8215,7 @@
     </function-decl>
     <function-decl name='__interceptor_random_r' mangled-name='__interceptor_random_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_random_r'>
       <parameter type-id='type-id-3' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2549' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_attr_getdetachstate' mangled-name='__interceptor_pthread_attr_getdetachstate' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getdetachstate'>
@@ -8251,7 +8251,7 @@
     <function-decl name='__interceptor_pthread_attr_getstack' mangled-name='__interceptor_pthread_attr_getstack' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getstack'>
       <parameter type-id='type-id-3' name='attr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
       <parameter type-id='type-id-258' name='addr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2581' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_pthread_attr_getinheritsched' mangled-name='__interceptor_pthread_attr_getinheritsched' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_pthread_attr_getinheritsched'>
@@ -8285,20 +8285,20 @@
     </function-decl>
     <function-decl name='__interceptor_sincos' mangled-name='__interceptor_sincos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincos'>
       <parameter type-id='type-id-378' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
-      <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-1061' name='cos' 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 type-id='type-id-1083' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2697' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__interceptor_sincosf' mangled-name='__interceptor_sincosf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosf'>
       <parameter type-id='type-id-379' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
-      <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-1066' name='cos' 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 type-id='type-id-1088' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2704' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__interceptor_sincosl' mangled-name='__interceptor_sincosl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sincosl'>
       <parameter type-id='type-id-383' name='x' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
-      <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-1167' name='cos' 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 type-id='type-id-1189' name='cos' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2711' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__interceptor_remquo' mangled-name='__interceptor_remquo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_remquo'>
@@ -8348,33 +8348,33 @@
     </function-decl>
     <function-decl name='__interceptor_drand48_r' mangled-name='__interceptor_drand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_drand48_r'>
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2818' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_lrand48_r' mangled-name='__interceptor_lrand48_r' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_lrand48_r'>
       <parameter type-id='type-id-3' name='buffer' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2825' column='1'/>
-      <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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
-      <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-1043' name='lineptr' 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 type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2840' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <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 type-id='type-id-1021' name='lineptr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
-      <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-1043' name='lineptr' 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 type-id='type-id-6' name='delim' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <parameter type-id='type-id-3' name='stream' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2851' column='1'/>
       <return type-id='type-id-414'/>
     </function-decl>
     <function-decl name='__interceptor_iconv' mangled-name='__interceptor_iconv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_iconv'>
       <parameter type-id='type-id-3' name='cd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
-      <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-928' name='inbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
-      <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-928' name='outbytesleft' 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 type-id='type-id-937' name='inbytesleft' 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 type-id='type-id-937' name='outbytesleft' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2871' column='1'/>
       <return type-id='type-id-412'/>
     </function-decl>
     <function-decl name='__interceptor_times' mangled-name='__interceptor_times' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc' line='2896' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_times'>
@@ -8383,20 +8383,20 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_recvmsg' mangled-name='__sanitizer_syscall_pre_impl_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_recvmsg'>
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
-      <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 type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='153' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_recvmsg' mangled-name='__sanitizer_syscall_post_impl_recvmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmsg'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
       <parameter type-id='type-id-41' name='sockfd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='157' column='1'/>
-      <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 type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='158' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_recvmmsg' mangled-name='__sanitizer_syscall_pre_impl_recvmmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_recvmmsg'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='169' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='170' column='1'/>
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='170' column='1'/>
@@ -8405,7 +8405,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_recvmmsg' mangled-name='__sanitizer_syscall_post_impl_recvmmsg' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_recvmmsg'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='174' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
       <parameter type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='175' column='1'/>
@@ -8610,7 +8610,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_getgroups' mangled-name='__sanitizer_syscall_post_impl_getgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getgroups'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='326' column='1'/>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='326' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_setregid' mangled-name='__sanitizer_syscall_pre_impl_setregid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_setregid'>
@@ -8717,13 +8717,13 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_setgroups' mangled-name='__sanitizer_syscall_pre_impl_setgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_setgroups'>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='373' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_setgroups' mangled-name='__sanitizer_syscall_post_impl_setgroups' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_setgroups'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='377' column='1'/>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='377' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_acct' mangled-name='__sanitizer_syscall_pre_impl_acct' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_acct'>
@@ -10151,7 +10151,7 @@
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1288' column='1'/>
       <parameter type-id='type-id-41' name='min_nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1288' column='1'/>
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1288' column='1'/>
-      <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 type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1289' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10160,34 +10160,34 @@
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1293' column='1'/>
       <parameter type-id='type-id-41' name='min_nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1293' column='1'/>
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1293' column='1'/>
-      <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 type-id='type-id-3' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1294' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_io_submit' mangled-name='__sanitizer_syscall_pre_impl_io_submit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_io_submit'>
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1311' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_io_submit' mangled-name='__sanitizer_syscall_post_impl_io_submit' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_io_submit'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1'/>
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1'/>
       <parameter type-id='type-id-41' name='nr' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1335' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_io_cancel' mangled-name='__sanitizer_syscall_pre_impl_io_cancel' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_io_cancel'>
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
-      <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-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1338' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1339' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_io_cancel' mangled-name='__sanitizer_syscall_post_impl_io_cancel' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_io_cancel'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
       <parameter type-id='type-id-41' name='ctx_id' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
-      <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-974' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
+      <parameter type-id='type-id-994' name='iocb' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1342' column='1'/>
+      <parameter type-id='type-id-992' name='result' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1343' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_sendfile' mangled-name='__sanitizer_syscall_pre_impl_sendfile' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_sendfile'>
@@ -10201,7 +10201,7 @@
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1357' column='1'/>
       <parameter type-id='type-id-41' name='out_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1357' column='1'/>
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1357' column='1'/>
-      <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 type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1358' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10216,7 +10216,7 @@
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1366' column='1'/>
       <parameter type-id='type-id-41' name='out_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1366' column='1'/>
       <parameter type-id='type-id-41' name='in_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1366' column='1'/>
-      <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 type-id='type-id-41' name='count' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1367' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10423,9 +10423,9 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getresuid16' mangled-name='__sanitizer_syscall_post_impl_getresuid16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getresuid16'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
-      <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-949' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
-      <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='ruid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1481' column='1'/>
+      <parameter type-id='type-id-966' name='euid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1482' column='1'/>
+      <parameter type-id='type-id-966' name='suid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1483' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_setresgid16' mangled-name='__sanitizer_syscall_pre_impl_setresgid16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_setresgid16'>
@@ -10449,9 +10449,9 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getresgid16' mangled-name='__sanitizer_syscall_post_impl_getresgid16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getresgid16'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
-      <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-947' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
-      <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='rgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1497' column='1'/>
+      <parameter type-id='type-id-964' name='egid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1498' column='1'/>
+      <parameter type-id='type-id-964' name='sgid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1499' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_setfsuid16' mangled-name='__sanitizer_syscall_pre_impl_setfsuid16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_setfsuid16'>
@@ -10474,24 +10474,24 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getgroups16' mangled-name='__sanitizer_syscall_pre_impl_getgroups16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getgroups16'>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1515' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getgroups16' mangled-name='__sanitizer_syscall_post_impl_getgroups16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getgroups16'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1518' column='1'/>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1518' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_setgroups16' mangled-name='__sanitizer_syscall_pre_impl_setgroups16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1525' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_setgroups16'>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1525' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_setgroups16' mangled-name='__sanitizer_syscall_post_impl_setgroups16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_setgroups16'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1530' column='1'/>
       <parameter type-id='type-id-41' name='gidsetsize' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1530' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getuid16' mangled-name='__sanitizer_syscall_pre_impl_getuid16' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getuid16'>
@@ -10576,14 +10576,14 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_readv' mangled-name='__sanitizer_syscall_pre_impl_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_readv'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1585' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_readv' mangled-name='__sanitizer_syscall_post_impl_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_readv'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1587' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1588' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10602,14 +10602,14 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_writev' mangled-name='__sanitizer_syscall_pre_impl_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_writev'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1600' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_writev' mangled-name='__sanitizer_syscall_post_impl_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_writev'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1602' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1603' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10645,7 +10645,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_preadv' mangled-name='__sanitizer_syscall_pre_impl_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_preadv'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1643' column='1'/>
       <parameter type-id='type-id-41' name='pos_l' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1644' column='1'/>
       <parameter type-id='type-id-41' name='pos_h' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1644' column='1'/>
@@ -10654,7 +10654,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_preadv' mangled-name='__sanitizer_syscall_post_impl_preadv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_preadv'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1646' column='1'/>
       <parameter type-id='type-id-41' name='pos_l' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1647' column='1'/>
       <parameter type-id='type-id-41' name='pos_h' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1647' column='1'/>
@@ -10662,7 +10662,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_pwritev' mangled-name='__sanitizer_syscall_pre_impl_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_pwritev'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1653' column='1'/>
       <parameter type-id='type-id-41' name='pos_l' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1654' column='1'/>
       <parameter type-id='type-id-41' name='pos_h' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1654' column='1'/>
@@ -10671,7 +10671,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_pwritev' mangled-name='__sanitizer_syscall_post_impl_pwritev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_pwritev'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1656' column='1'/>
-      <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 type-id='type-id-41' name='vlen' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1657' column='1'/>
       <parameter type-id='type-id-41' name='pos_l' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1657' column='1'/>
       <parameter type-id='type-id-41' name='pos_h' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1657' column='1'/>
@@ -10816,46 +10816,46 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_bind' mangled-name='__sanitizer_syscall_pre_impl_bind' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_bind'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
-      <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 type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1758' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_bind' mangled-name='__sanitizer_syscall_post_impl_bind' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_bind'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1760' column='1'/>
-      <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 type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1761' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_connect' mangled-name='__sanitizer_syscall_pre_impl_connect' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_connect'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
-      <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 type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1767' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_connect' mangled-name='__sanitizer_syscall_post_impl_connect' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_connect'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1769' column='1'/>
-      <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 type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1770' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_accept' mangled-name='__sanitizer_syscall_pre_impl_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_accept'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1776' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_accept' mangled-name='__sanitizer_syscall_post_impl_accept' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_accept'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1778' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1779' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_accept4' mangled-name='__sanitizer_syscall_pre_impl_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_accept4'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1786' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1787' column='1'/>
       <return type-id='type-id-27'/>
@@ -10863,34 +10863,34 @@
     <function-decl name='__sanitizer_syscall_post_impl_accept4' mangled-name='__sanitizer_syscall_post_impl_accept4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_accept4'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1789' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1790' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getsockname' mangled-name='__sanitizer_syscall_pre_impl_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getsockname'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1797' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1798' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getsockname' mangled-name='__sanitizer_syscall_post_impl_getsockname' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getsockname'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1800' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1801' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_getpeername' mangled-name='__sanitizer_syscall_pre_impl_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_getpeername'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1808' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1809' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_getpeername' mangled-name='__sanitizer_syscall_post_impl_getpeername' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_getpeername'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1811' column='1'/>
-      <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 type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1812' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10914,7 +10914,7 @@
       <parameter type-id='type-id-3' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1827' column='1'/>
-      <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 type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1828' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10924,7 +10924,7 @@
       <parameter type-id='type-id-3' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <parameter type-id='type-id-41' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
       <parameter type-id='type-id-41' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1830' column='1'/>
-      <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 type-id='type-id-41' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1831' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10975,7 +10975,7 @@
       <parameter type-id='type-id-3' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <parameter type-id='type-id-41' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1858' column='1'/>
-      <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 type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1859' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -10985,7 +10985,7 @@
       <parameter type-id='type-id-3' name='buf' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <parameter type-id='type-id-41' name='len' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1861' column='1'/>
-      <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 type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1862' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -11047,25 +11047,25 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_poll' mangled-name='__sanitizer_syscall_post_impl_poll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_poll'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
-      <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 type-id='type-id-41' name='nfds' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1897' column='1'/>
       <parameter type-id='type-id-41' name='timeout' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1898' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_select' mangled-name='__sanitizer_syscall_pre_impl_select' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_select'>
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
-      <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-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
-      <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='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1904' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1905' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1906' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_select' mangled-name='__sanitizer_syscall_post_impl_select' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_select'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
       <parameter type-id='type-id-41' name='n' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
-      <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-939' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
-      <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='inp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1908' column='1'/>
+      <parameter type-id='type-id-956' name='outp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1909' column='1'/>
+      <parameter type-id='type-id-956' name='exp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <parameter type-id='type-id-3' name='tvp' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='1910' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
@@ -11602,12 +11602,12 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_sysctl' mangled-name='__sanitizer_syscall_post_impl_sysctl' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_sysctl'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2249' column='1'/>
-      <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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_sysinfo' mangled-name='__sanitizer_syscall_pre_impl_sysinfo' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2258' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_sysinfo'>
@@ -12147,7 +12147,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_vmsplice' mangled-name='__sanitizer_syscall_pre_impl_vmsplice' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_vmsplice'>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
-      <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 type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2637' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2638' column='1'/>
       <return type-id='type-id-27'/>
@@ -12155,7 +12155,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_vmsplice' mangled-name='__sanitizer_syscall_post_impl_vmsplice' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_vmsplice'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
       <parameter type-id='type-id-41' name='fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2640' column='1'/>
-      <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 type-id='type-id-41' name='nr_segs' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2641' column='1'/>
       <parameter type-id='type-id-41' name='flags' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2641' column='1'/>
       <return type-id='type-id-27'/>
@@ -12312,9 +12312,9 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_pselect6' mangled-name='__sanitizer_syscall_pre_impl_pselect6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_pselect6'>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
-      <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-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
-      <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='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2726' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2727' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2728' column='1'/>
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2729' column='1'/>
       <return type-id='type-id-27'/>
@@ -12322,15 +12322,15 @@
     <function-decl name='__sanitizer_syscall_post_impl_pselect6' mangled-name='__sanitizer_syscall_post_impl_pselect6' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_pselect6'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
       <parameter type-id='type-id-41' name='arg0' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
-      <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-939' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
-      <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='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2731' column='1'/>
+      <parameter type-id='type-id-956' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2732' column='1'/>
+      <parameter type-id='type-id-956' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <parameter type-id='type-id-3' name='arg4' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2733' column='1'/>
       <parameter type-id='type-id-3' name='arg5' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2734' column='1'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <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 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 type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2743' column='1'/>
       <parameter type-id='type-id-1226' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2744' column='1'/>
@@ -12339,7 +12339,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_ppoll' mangled-name='__sanitizer_syscall_post_impl_ppoll' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_ppoll'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
-      <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 type-id='type-id-41' name='arg1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <parameter type-id='type-id-3' name='arg2' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2748' column='1'/>
       <parameter type-id='type-id-3' name='arg3' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2749' column='1'/>
@@ -12356,7 +12356,7 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <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 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 type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2760' column='1'/>
       <parameter type-id='type-id-41' name='cpu' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2761' column='1'/>
       <parameter type-id='type-id-41' name='group_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2761' column='1'/>
@@ -12365,7 +12365,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_post_impl_perf_event_open' mangled-name='__sanitizer_syscall_post_impl_perf_event_open' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_perf_event_open'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2765' column='1'/>
-      <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 type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2766' column='1'/>
       <parameter type-id='type-id-41' name='cpu' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2766' column='1'/>
       <parameter type-id='type-id-41' name='group_fd' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2766' column='1'/>
@@ -12443,7 +12443,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_process_vm_readv' mangled-name='__sanitizer_syscall_pre_impl_process_vm_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_process_vm_readv'>
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2793' column='1'/>
-      <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 type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2794' column='1'/>
       <parameter type-id='type-id-3' name='rvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2794' column='1'/>
       <parameter type-id='type-id-41' name='riovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2794' column='1'/>
@@ -12453,7 +12453,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_process_vm_readv' mangled-name='__sanitizer_syscall_post_impl_process_vm_readv' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2797' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_process_vm_readv'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2797' column='1'/>
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2797' column='1'/>
-      <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 type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2798' column='1'/>
       <parameter type-id='type-id-3' name='rvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2799' column='1'/>
       <parameter type-id='type-id-41' name='riovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2799' column='1'/>
@@ -12462,7 +12462,7 @@
     </function-decl>
     <function-decl name='__sanitizer_syscall_pre_impl_process_vm_writev' mangled-name='__sanitizer_syscall_pre_impl_process_vm_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_pre_impl_process_vm_writev'>
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2805' column='1'/>
-      <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 type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2806' column='1'/>
       <parameter type-id='type-id-3' name='rvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2806' column='1'/>
       <parameter type-id='type-id-41' name='riovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2806' column='1'/>
@@ -12472,7 +12472,7 @@
     <function-decl name='__sanitizer_syscall_post_impl_process_vm_writev' mangled-name='__sanitizer_syscall_post_impl_process_vm_writev' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sanitizer_syscall_post_impl_process_vm_writev'>
       <parameter type-id='type-id-41' name='res' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2809' column='1'/>
       <parameter type-id='type-id-41' name='pid' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2809' column='1'/>
-      <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 type-id='type-id-41' name='liovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2810' column='1'/>
       <parameter type-id='type-id-3' name='rvec' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2811' column='1'/>
       <parameter type-id='type-id-41' name='riovcnt' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common_syscalls.inc' line='2811' column='1'/>
@@ -12494,9 +12494,9 @@
       <return type-id='type-id-27'/>
     </function-decl>
     <namespace-decl name='__sanitizer'>
-      <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'>
-          <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'>
           <var-decl name='capacity_' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='383' column='1'/>
@@ -12506,103 +12506,103 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='InternalMmapVector' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
-            <parameter type-id='type-id-1024'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <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'>
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <return type-id='type-id-2'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-934'/>
+            <return type-id='type-id-951'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <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'>
-            <parameter type-id='type-id-1025' is-artificial='yes'/>
+            <parameter type-id='type-id-1047' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-1030'/>
+            <return type-id='type-id-1052'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <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'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-930' is-artificial='yes'/>
-            <parameter type-id='type-id-1030'/>
+            <parameter type-id='type-id-947' is-artificial='yes'/>
+            <parameter type-id='type-id-1052'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <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'>
           <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'>
             <data-member access='public' layout-offset-in-bits='0'>
@@ -12649,101 +12649,101 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <parameter type-id='type-id-1232'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <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'>
-            <parameter type-id='type-id-1028' is-artificial='yes'/>
+            <parameter type-id='type-id-1050' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <return type-id='type-id-112'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='28' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <parameter type-id='type-id-1232'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='LibIgnore' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_libignore.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-1027'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-1049'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <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'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <parameter type-id='type-id-1232'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
-            <parameter type-id='type-id-1033'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
+            <parameter type-id='type-id-1055'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-932' is-artificial='yes'/>
+            <parameter type-id='type-id-949' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <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'>
-          <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'>
           <var-decl name='can_parse_' type-id='type-id-112' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='48' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SuppressionContext' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <parameter type-id='type-id-195'/>
             <parameter type-id='type-id-189'/>
@@ -12752,38 +12752,38 @@
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <parameter type-id='type-id-4'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <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'>
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <return type-id='type-id-2'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <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'>
-            <parameter type-id='type-id-1034' is-artificial='yes'/>
+            <parameter type-id='type-id-1056' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
-            <return type-id='type-id-1031'/>
+            <return type-id='type-id-1053'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <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'>
-            <parameter type-id='type-id-937' is-artificial='yes'/>
+            <parameter type-id='type-id-954' is-artificial='yes'/>
             <parameter type-id='type-id-190'/>
             <return type-id='type-id-27'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <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'>
           <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>
-      <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'>
           <var-decl name='name' type-id='type-id-35' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='130' column='1'/>
         </data-member>
@@ -12806,7 +12806,7 @@
           <var-decl name='___unused' type-id='type-id-924' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='136' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12817,7 +12817,7 @@
           <var-decl name='d_reclen' type-id='type-id-233' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='329' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12828,17 +12828,17 @@
           <var-decl name='d_reclen' type-id='type-id-233' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='345' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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>
-      <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'>
           <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'>
-          <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'>
           <var-decl name='h_addrtype' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='474' column='1'/>
@@ -12847,10 +12847,10 @@
           <var-decl name='h_length' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='475' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <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>
-      <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'>
           <var-decl name='data' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='118' column='1'/>
         </data-member>
@@ -12864,7 +12864,7 @@
           <var-decl name='res2' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='121' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12899,7 +12899,7 @@
           <var-decl name='aio_reserved3' type-id='type-id-116' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='114' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12912,7 +12912,7 @@
           <var-decl name='sig' type-id='type-id-920' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='420' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12932,7 +12932,7 @@
           <var-decl name='mnt_passno' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='282' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -12940,7 +12940,7 @@
           <var-decl name='msg_namelen' type-id='type-id-172' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='304' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <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'>
           <var-decl name='msg_iovlen' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='306' column='1'/>
@@ -12955,7 +12955,7 @@
           <var-decl name='msg_flags' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='309' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <var-decl name='type' type-id='type-id-172' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='80' column='1'/>
         </data-member>
@@ -12963,7 +12963,7 @@
           <var-decl name='size' type-id='type-id-172' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='81' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <var-decl name='fd' type-id='type-id-6' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='480' column='1'/>
         </data-member>
@@ -12979,7 +12979,7 @@
           <var-decl name='val' type-id='type-id-922' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='399' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'/>
         </data-member>
@@ -13014,18 +13014,18 @@
           <var-decl name='tm_zone' type-id='type-id-4' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='272' column='1'/>
         </data-member>
       </class-decl>
-      <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'>
           <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'>
-          <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'>
           <var-decl name='we_offs' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='514' column='1'/>
         </data-member>
       </class-decl>
-      <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-decl name='Type' type-id='type-id-237' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic.h' line='39' column='1' id='type-id-235'/>
         </member-type>
@@ -13035,12 +13035,12 @@
       </class-decl>
       <typedef-decl name='OFF64_T' type-id='type-id-116' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='85' column='1' id='type-id-409'/>
       <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-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_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_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_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_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_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_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-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-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-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-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-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-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-decl name='__sanitizer_nfds_t' type-id='type-id-1' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h' line='488' column='1' id='type-id-1228'/>
       <typedef-decl name='s16' type-id='type-id-73' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_internal_defs.h' line='71' column='1' id='type-id-1235'/>
@@ -13248,7 +13248,7 @@
       </function-decl>
       <function-decl name='atomic_compare_exchange_strong&lt;__sanitizer::atomic_uint32_t&gt;' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_atomic_clang.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-236'/>
-        <parameter type-id='type-id-1000'/>
+        <parameter type-id='type-id-1018'/>
         <parameter type-id='type-id-235'/>
         <parameter type-id='type-id-102'/>
         <return type-id='type-id-112'/>
@@ -13269,8 +13269,8 @@
         <return type-id='type-id-1'/>
       </function-decl>
       <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 type-id='type-id-1161'/>
-        <parameter type-id='type-id-1161'/>
+        <parameter type-id='type-id-1183'/>
+        <parameter type-id='type-id-1183'/>
         <return type-id='type-id-27'/>
       </function-decl>
       <function-decl name='ToLower' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13310,8 +13310,8 @@
     </function-decl>
     <function-decl name='pthread_sigmask' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-1044'/>
-      <parameter type-id='type-id-991'/>
+      <parameter type-id='type-id-1066'/>
+      <parameter type-id='type-id-1009'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='pthread_self' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13444,12 +13444,12 @@
     </function-decl>
     <function-decl name='operator new' mangled-name='_ZnwmRKSt9nothrow_t' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='571' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnwmRKSt9nothrow_t'>
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='571' column='1'/>
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='operator new []' mangled-name='_ZnamRKSt9nothrow_t' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZnamRKSt9nothrow_t'>
       <parameter type-id='type-id-2' name='size' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='577' column='1'/>
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='operator delete' mangled-name='_ZdlPv' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPv'>
@@ -13462,12 +13462,12 @@
     </function-decl>
     <function-decl name='operator delete' mangled-name='_ZdlPvRKSt9nothrow_t' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdlPvRKSt9nothrow_t'>
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='603' column='1'/>
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='operator delete []' mangled-name='_ZdaPvRKSt9nothrow_t' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZdaPvRKSt9nothrow_t'>
       <parameter type-id='type-id-3' name='ptr' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='609' column='1'/>
-      <parameter type-id='type-id-1051'/>
+      <parameter type-id='type-id-1073'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <function-decl name='__interceptor_strlen' mangled-name='__interceptor_strlen' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='613' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_strlen'>
@@ -13588,15 +13588,15 @@
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-27'/>
     </function-decl>
     <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'>
@@ -14025,8 +14025,8 @@
     </function-decl>
     <function-decl name='__interceptor_sigaction' mangled-name='__interceptor_sigaction' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_sigaction'>
       <parameter type-id='type-id-6' name='sig' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
-      <parameter type-id='type-id-1173' name='act' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1678' column='1'/>
-      <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='act' 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_signal' mangled-name='__interceptor_signal' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_signal'>
@@ -14035,7 +14035,7 @@
       <return type-id='type-id-402'/>
     </function-decl>
     <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 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'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='__interceptor_raise' mangled-name='__interceptor_raise' filepath='../../.././libsanitizer/tsan/tsan_interceptors.cc' line='1715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__interceptor_raise'>
@@ -14700,523 +14700,520 @@
         <enumerator name='StatCnt' value='438'/>
       </enum-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-954'>
+    <function-type size-in-bits='64' id='type-id-972'>
       <parameter type-id='type-id-3' name='dirp'/>
-      <return type-id='type-id-953'/>
+      <return type-id='type-id-971'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-959'>
+    <function-type size-in-bits='64' id='type-id-977'>
       <parameter type-id='type-id-3' name='dirp'/>
-      <return type-id='type-id-958'/>
+      <return type-id='type-id-976'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-964'>
+    <function-type size-in-bits='64' id='type-id-982'>
       <parameter type-id='type-id-28' name='buf'/>
-      <return type-id='type-id-963'/>
+      <return type-id='type-id-981'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-965'>
+    <function-type size-in-bits='64' id='type-id-983'>
       <parameter type-id='type-id-28' name='buf'/>
-      <parameter type-id='type-id-963' name='addr'/>
-      <return type-id='type-id-963'/>
+      <parameter type-id='type-id-981' name='addr'/>
+      <return type-id='type-id-981'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-968'>
+    <function-type size-in-bits='64' id='type-id-986'>
       <parameter type-id='type-id-28' name='name'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-969'>
+    <function-type size-in-bits='64' id='type-id-987'>
       <parameter type-id='type-id-28' name='name'/>
       <parameter type-id='type-id-6' name='af'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-970'>
+    <function-type size-in-bits='64' id='type-id-988'>
       <parameter type-id='type-id-6' name='fake'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-971'>
+    <function-type size-in-bits='64' id='type-id-989'>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-6' name='len'/>
       <parameter type-id='type-id-6' name='type'/>
-      <return type-id='type-id-967'/>
+      <return type-id='type-id-985'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-983'>
+    <function-type size-in-bits='64' id='type-id-1001'>
       <parameter type-id='type-id-3' name='fp'/>
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-984'>
+    <function-type size-in-bits='64' id='type-id-1002'>
       <parameter type-id='type-id-3' name='fp'/>
-      <parameter type-id='type-id-982' name='mntbuf'/>
+      <parameter type-id='type-id-1000' name='mntbuf'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-6' name='buflen'/>
-      <return type-id='type-id-982'/>
+      <return type-id='type-id-1000'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-994'>
+    <function-type size-in-bits='64' id='type-id-1012'>
       <parameter type-id='type-id-137' name='timep'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-995'>
+    <function-type size-in-bits='64' id='type-id-1013'>
       <parameter type-id='type-id-137' name='timep'/>
       <parameter type-id='type-id-3' name='result'/>
-      <return type-id='type-id-993'/>
+      <return type-id='type-id-1011'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1002'>
-      <parameter type-id='type-id-963' name='addr'/>
+    <function-type size-in-bits='64' id='type-id-1024'>
+      <parameter type-id='type-id-981' name='addr'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1003'>
-      <parameter type-id='type-id-963' name='addr'/>
+    <function-type size-in-bits='64' id='type-id-1025'>
+      <parameter type-id='type-id-981' name='addr'/>
       <parameter type-id='type-id-28' name='buf'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1004'>
-      <parameter type-id='type-id-993' name='tm'/>
+    <function-type size-in-bits='64' id='type-id-1026'>
+      <parameter type-id='type-id-1011' name='tm'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1005'>
-      <parameter type-id='type-id-993' name='tm'/>
+    <function-type size-in-bits='64' id='type-id-1027'>
+      <parameter type-id='type-id-1011' name='tm'/>
       <parameter type-id='type-id-28' name='result'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1006'>
+    <function-type size-in-bits='64' id='type-id-1028'>
       <parameter type-id='type-id-28' name='s'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1007'>
+    <function-type size-in-bits='64' id='type-id-1030'>
       <parameter type-id='type-id-28' name='dir'/>
       <parameter type-id='type-id-28' name='pfx'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1008'>
+    <function-type size-in-bits='64' id='type-id-1031'>
       <parameter type-id='type-id-28' name='s'/>
       <parameter type-id='type-id-28' name='format'/>
-      <parameter type-id='type-id-993' name='tm'/>
+      <parameter type-id='type-id-1011' name='tm'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1009'>
+    <function-type size-in-bits='64' id='type-id-1032'>
       <parameter type-id='type-id-28' name='dst'/>
       <parameter type-id='type-id-28' name='src'/>
       <parameter type-id='type-id-2' name='n'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1010'>
+    <function-type size-in-bits='64' id='type-id-1033'>
       <parameter type-id='type-id-28' name='dst'/>
       <parameter type-id='type-id-4' name='src'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1011'>
+    <function-type size-in-bits='64' id='type-id-1034'>
       <parameter type-id='type-id-28' name='s'/>
       <parameter type-id='type-id-6' name='c'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1012'>
+    <function-type size-in-bits='64' id='type-id-1029'>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='size'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1014'>
+    <function-type size-in-bits='64' id='type-id-1036'>
       <parameter type-id='type-id-4' name='path'/>
       <parameter type-id='type-id-28' name='resolved_path'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1015'>
+    <function-type size-in-bits='64' id='type-id-1037'>
       <parameter type-id='type-id-6' name='errnum'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1016'>
+    <function-type size-in-bits='64' id='type-id-1038'>
       <parameter type-id='type-id-6' name='category'/>
       <parameter type-id='type-id-28' name='locale'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1017'>
+    <function-type size-in-bits='64' id='type-id-1039'>
       <parameter type-id='type-id-6' name='errnum'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1018'>
+    <function-type size-in-bits='64' id='type-id-1040'>
       <parameter type-id='type-id-6' name='af'/>
       <parameter type-id='type-id-3' name='src'/>
       <parameter type-id='type-id-28' name='dst'/>
       <parameter type-id='type-id-237' name='size'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1019'>
+    <function-type size-in-bits='64' id='type-id-1041'>
       <parameter type-id='type-id-137' name='timep'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1020'>
+    <function-type size-in-bits='64' id='type-id-1042'>
       <parameter type-id='type-id-137' name='timep'/>
       <parameter type-id='type-id-28' name='result'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1022'>
+    <function-type size-in-bits='64' id='type-id-1044'>
       <parameter type-id='type-id-258' name='buffer'/>
       <parameter type-id='type-id-6' name='size'/>
-      <return type-id='type-id-1021'/>
+      <return type-id='type-id-1043'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1045'>
+    <function-type size-in-bits='64' id='type-id-1067'>
       <parameter type-id='type-id-4' name='s1'/>
       <parameter type-id='type-id-4' name='s2'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1057'>
+    <function-type size-in-bits='64' id='type-id-1079'>
       <parameter type-id='type-id-378' name='x'/>
       <return type-id='type-id-378'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1163'>
+    <function-type size-in-bits='64' id='type-id-1185'>
       <parameter type-id='type-id-383' name='x'/>
       <return type-id='type-id-383'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1058'>
+    <function-type size-in-bits='64' id='type-id-1080'>
       <parameter type-id='type-id-378' name='x'/>
-      <parameter type-id='type-id-1061' name='iptr'/>
+      <parameter type-id='type-id-1083' name='iptr'/>
       <return type-id='type-id-378'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1165'>
+    <function-type size-in-bits='64' id='type-id-1187'>
       <parameter type-id='type-id-383' name='x'/>
-      <parameter type-id='type-id-1167' name='iptr'/>
+      <parameter type-id='type-id-1189' name='iptr'/>
       <return type-id='type-id-383'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1059'>
+    <function-type size-in-bits='64' id='type-id-1081'>
       <parameter type-id='type-id-378' name='x'/>
       <parameter type-id='type-id-378' name='y'/>
       <parameter type-id='type-id-35' name='quo'/>
       <return type-id='type-id-378'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1166'>
+    <function-type size-in-bits='64' id='type-id-1188'>
       <parameter type-id='type-id-383' name='x'/>
       <parameter type-id='type-id-383' name='y'/>
       <parameter type-id='type-id-35' name='quo'/>
       <return type-id='type-id-383'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1060'>
+    <function-type size-in-bits='64' id='type-id-1082'>
       <parameter type-id='type-id-378' name='x'/>
       <parameter type-id='type-id-35' name='signp'/>
       <return type-id='type-id-378'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1164'>
+    <function-type size-in-bits='64' id='type-id-1186'>
       <parameter type-id='type-id-383' name='x'/>
       <parameter type-id='type-id-35' name='signp'/>
       <return type-id='type-id-383'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1062'>
+    <function-type size-in-bits='64' id='type-id-1084'>
       <parameter type-id='type-id-379' name='x'/>
       <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1063'>
+    <function-type size-in-bits='64' id='type-id-1085'>
       <parameter type-id='type-id-379' name='x'/>
-      <parameter type-id='type-id-1066' name='iptr'/>
+      <parameter type-id='type-id-1088' name='iptr'/>
       <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1064'>
+    <function-type size-in-bits='64' id='type-id-1086'>
       <parameter type-id='type-id-379' name='x'/>
       <parameter type-id='type-id-379' name='y'/>
       <parameter type-id='type-id-35' name='quo'/>
       <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1065'>
+    <function-type size-in-bits='64' id='type-id-1087'>
       <parameter type-id='type-id-379' name='x'/>
       <parameter type-id='type-id-35' name='signp'/>
       <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1067'>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1068'>
-      <parameter type-id='type-id-967' name='ret'/>
+    <function-type size-in-bits='64' id='type-id-1089'>
+      <parameter type-id='type-id-985' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <parameter type-id='type-id-35' name='h_errnop'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1069'>
-      <parameter type-id='type-id-990' name='fds'/>
+    <function-type size-in-bits='64' id='type-id-1090'>
+      <parameter type-id='type-id-1008' name='fds'/>
       <parameter type-id='type-id-1228' name='nfds'/>
       <parameter type-id='type-id-6' name='timeout'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1070'>
-      <parameter type-id='type-id-990' name='fds'/>
+    <function-type size-in-bits='64' id='type-id-1091'>
+      <parameter type-id='type-id-1008' name='fds'/>
       <parameter type-id='type-id-1228' name='nfds'/>
       <parameter type-id='type-id-3' name='timeout_ts'/>
-      <parameter type-id='type-id-991' name='sigmask'/>
+      <parameter type-id='type-id-1009' name='sigmask'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1071'>
-      <parameter type-id='type-id-991' name='set'/>
+    <function-type size-in-bits='64' id='type-id-1092'>
+      <parameter type-id='type-id-1009' name='set'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1072'>
-      <parameter type-id='type-id-991' name='set'/>
+    <function-type size-in-bits='64' id='type-id-1093'>
+      <parameter type-id='type-id-1009' name='set'/>
       <parameter type-id='type-id-35' name='sig'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1073'>
-      <parameter type-id='type-id-991' name='set'/>
+    <function-type size-in-bits='64' id='type-id-1094'>
+      <parameter type-id='type-id-1009' name='set'/>
       <parameter type-id='type-id-3' name='info'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1074'>
-      <parameter type-id='type-id-991' name='set'/>
+    <function-type size-in-bits='64' id='type-id-1095'>
+      <parameter type-id='type-id-1009' name='set'/>
       <parameter type-id='type-id-3' name='info'/>
       <parameter type-id='type-id-3' name='timeout'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1075'>
+    <function-type size-in-bits='64' id='type-id-1099'>
       <parameter type-id='type-id-28' name='path'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1183'>
-      <parameter type-id='type-id-1021' name='lineptr'/>
-      <parameter type-id='type-id-928' name='n'/>
+    <function-type size-in-bits='64' id='type-id-938'>
+      <parameter type-id='type-id-1043' name='lineptr'/>
+      <parameter type-id='type-id-937' name='n'/>
       <parameter type-id='type-id-6' name='delim'/>
       <parameter type-id='type-id-3' name='stream'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1184'>
-      <parameter type-id='type-id-1021' name='lineptr'/>
-      <parameter type-id='type-id-928' name='n'/>
+    <function-type size-in-bits='64' id='type-id-939'>
+      <parameter type-id='type-id-1043' name='lineptr'/>
+      <parameter type-id='type-id-937' name='n'/>
       <parameter type-id='type-id-3' name='stream'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1076'>
+    <function-type size-in-bits='64' id='type-id-1100'>
       <parameter type-id='type-id-28' name='dirp'/>
-      <parameter type-id='type-id-956' name='namelist'/>
+      <parameter type-id='type-id-974' name='namelist'/>
       <parameter type-id='type-id-791' name='filter'/>
       <parameter type-id='type-id-787' name='compar'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1077'>
+    <function-type size-in-bits='64' id='type-id-1101'>
       <parameter type-id='type-id-28' name='dirp'/>
-      <parameter type-id='type-id-961' name='namelist'/>
+      <parameter type-id='type-id-979' name='namelist'/>
       <parameter type-id='type-id-785' name='filter'/>
       <parameter type-id='type-id-781' name='compar'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1078'>
+    <function-type size-in-bits='64' id='type-id-1102'>
       <parameter type-id='type-id-28' name='hostname'/>
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1079'>
+    <function-type size-in-bits='64' id='type-id-1103'>
       <parameter type-id='type-id-28' name='line'/>
-      <parameter type-id='type-id-963' name='addr'/>
+      <parameter type-id='type-id-981' name='addr'/>
       <parameter type-id='type-id-28' name='hostname'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1080'>
+    <function-type size-in-bits='64' id='type-id-1104'>
       <parameter type-id='type-id-28' name='name'/>
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <parameter type-id='type-id-35' name='h_errnop'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1081'>
+    <function-type size-in-bits='64' id='type-id-1105'>
       <parameter type-id='type-id-28' name='s'/>
-      <parameter type-id='type-id-997' name='p'/>
+      <parameter type-id='type-id-1015' name='p'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1082'>
+    <function-type size-in-bits='64' id='type-id-1107'>
       <parameter type-id='type-id-28' name='name'/>
       <parameter type-id='type-id-6' name='af'/>
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <parameter type-id='type-id-35' name='h_errnop'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1083'>
+    <function-type size-in-bits='64' id='type-id-1106'>
       <parameter type-id='type-id-28' name='user'/>
       <parameter type-id='type-id-237' name='group'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1084'>
+    <function-type size-in-bits='64' id='type-id-1108'>
       <parameter type-id='type-id-28' name='path'/>
       <parameter type-id='type-id-3' name='buf'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1085'>
-      <parameter type-id='type-id-1036'/>
+    <function-type size-in-bits='64' id='type-id-1109'>
+      <parameter type-id='type-id-1058'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1086'>
-      <parameter type-id='type-id-1037'/>
-      <parameter type-id='type-id-1037'/>
+    <function-type size-in-bits='64' id='type-id-1110'>
+      <parameter type-id='type-id-1059'/>
+      <parameter type-id='type-id-1059'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1087'>
-      <parameter type-id='type-id-1039'/>
+    <function-type size-in-bits='64' id='type-id-1111'>
+      <parameter type-id='type-id-1061'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1088'>
-      <parameter type-id='type-id-1040'/>
-      <parameter type-id='type-id-1040'/>
+    <function-type size-in-bits='64' id='type-id-1112'>
+      <parameter type-id='type-id-1062'/>
+      <parameter type-id='type-id-1062'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1089'>
-      <parameter type-id='type-id-1044' name='mask'/>
+    <function-type size-in-bits='64' id='type-id-1113'>
+      <parameter type-id='type-id-1066' name='mask'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1090'>
+    <function-type size-in-bits='64' id='type-id-1114'>
       <parameter type-id='type-id-4' name='s'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1174'>
+    <function-type size-in-bits='64' id='type-id-1115'>
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-928'>
       <parameter type-id='type-id-4' name='nptr'/>
-      <parameter type-id='type-id-1021' name='endptr'/>
+      <parameter type-id='type-id-1043' name='endptr'/>
       <parameter type-id='type-id-6' name='base'/>
       <return type-id='type-id-408'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1091'>
+    <function-type size-in-bits='64' id='type-id-1116'>
       <parameter type-id='type-id-4' name='s1'/>
       <parameter type-id='type-id-4' name='s2'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1093'>
+    <function-type size-in-bits='64' id='type-id-1117'>
+      <parameter type-id='type-id-4' name='str'/>
+      <parameter type-id='type-id-4' name='format'/>
+      <parameter is-variadic='yes'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1119'>
       <parameter type-id='type-id-4' name='str'/>
       <parameter type-id='type-id-4' name='format'/>
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1092'>
+    <function-type size-in-bits='64' id='type-id-1118'>
       <parameter type-id='type-id-4' name='s1'/>
       <parameter type-id='type-id-4' name='s2'/>
       <parameter type-id='type-id-412' name='n'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1094'>
-      <parameter type-id='type-id-4' name='str'/>
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1095'>
+    <function-type size-in-bits='64' id='type-id-1120'>
       <parameter type-id='type-id-4' name='name'/>
       <parameter type-id='type-id-6' name='mode'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1096'>
+    <function-type size-in-bits='64' id='type-id-1121'>
       <parameter type-id='type-id-4' name='name'/>
       <parameter type-id='type-id-6' name='flags'/>
       <parameter type-id='type-id-6' name='mode'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1097'>
-      <parameter type-id='type-id-4' name='format'/>
-      <parameter type-id='type-id-1196' name='ap'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1098'>
+    <function-type size-in-bits='64' id='type-id-1122'>
       <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1099'>
+    <function-type size-in-bits='64' id='type-id-1123'>
       <parameter type-id='type-id-4' name='cp'/>
       <parameter type-id='type-id-3' name='dst'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1100'>
+    <function-type size-in-bits='64' id='type-id-1124'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1132'>
+    <function-type size-in-bits='64' id='type-id-1153'>
       <parameter type-id='type-id-612' name='usec'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1101'>
+    <function-type size-in-bits='64' id='type-id-1125'>
       <parameter type-id='type-id-35' name='status'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1102'>
+    <function-type size-in-bits='64' id='type-id-1126'>
       <parameter type-id='type-id-35' name='pipefd'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1103'>
+    <function-type size-in-bits='64' id='type-id-1127'>
       <parameter type-id='type-id-35' name='status'/>
       <parameter type-id='type-id-6' name='options'/>
       <parameter type-id='type-id-3' name='rusage'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1185'>
+    <function-type size-in-bits='64' id='type-id-940'>
       <parameter type-id='type-id-6' name='fd'/>
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <parameter type-id='type-id-6' name='iovcnt'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1186'>
+    <function-type size-in-bits='64' id='type-id-941'>
       <parameter type-id='type-id-6' name='fd'/>
-      <parameter type-id='type-id-979' name='iov'/>
+      <parameter type-id='type-id-997' name='iov'/>
       <parameter type-id='type-id-6' name='iovcnt'/>
       <parameter type-id='type-id-410' name='offset'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1187'>
+    <function-type size-in-bits='64' id='type-id-942'>
       <parameter type-id='type-id-6' name='fd'/>
-      <parameter type-id='type-id-986' name='msg'/>
+      <parameter type-id='type-id-1004' name='msg'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1104'>
+    <function-type size-in-bits='64' id='type-id-1129'>
       <parameter type-id='type-id-6' name='how'/>
-      <parameter type-id='type-id-991' name='set'/>
-      <parameter type-id='type-id-991' name='oldset'/>
+      <parameter type-id='type-id-1009' name='set'/>
+      <parameter type-id='type-id-1009' name='oldset'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1106'>
+    <function-type size-in-bits='64' id='type-id-1131'>
       <parameter type-id='type-id-6' name='errnum'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1107'>
+    <function-type size-in-bits='64' id='type-id-1132'>
       <parameter type-id='type-id-6' name='af'/>
       <parameter type-id='type-id-4' name='src'/>
       <parameter type-id='type-id-3' name='dst'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1108'>
+    <function-type size-in-bits='64' id='type-id-1133'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1109'>
+    <function-type size-in-bits='64' id='type-id-1134'>
       <parameter type-id='type-id-6' name='pid'/>
       <parameter type-id='type-id-35' name='status'/>
       <parameter type-id='type-id-6' name='options'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1110'>
+    <function-type size-in-bits='64' id='type-id-1135'>
       <parameter type-id='type-id-6' name='pid'/>
       <parameter type-id='type-id-35' name='status'/>
       <parameter type-id='type-id-6' name='options'/>
       <parameter type-id='type-id-3' name='rusage'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1111'>
+    <function-type size-in-bits='64' id='type-id-1136'>
       <parameter type-id='type-id-6' name='domain'/>
       <parameter type-id='type-id-6' name='type'/>
       <parameter type-id='type-id-6' name='protocol'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1112'>
+    <function-type size-in-bits='64' id='type-id-1137'>
       <parameter type-id='type-id-6' name='domain'/>
       <parameter type-id='type-id-6' name='type'/>
       <parameter type-id='type-id-6' name='protocol'/>
       <parameter type-id='type-id-35' name='fd'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1113'>
+    <function-type size-in-bits='64' id='type-id-1138'>
       <parameter type-id='type-id-6' name='epfd'/>
       <parameter type-id='type-id-6' name='op'/>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='ev'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1114'>
+    <function-type size-in-bits='64' id='type-id-1139'>
       <parameter type-id='type-id-6' name='sockfd'/>
       <parameter type-id='type-id-6' name='level'/>
       <parameter type-id='type-id-6' name='optname'/>
@@ -15224,31 +15221,31 @@
       <parameter type-id='type-id-35' name='optlen'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1115'>
+    <function-type size-in-bits='64' id='type-id-1140'>
       <parameter type-id='type-id-6' name='shmid'/>
       <parameter type-id='type-id-6' name='cmd'/>
       <parameter type-id='type-id-3' name='buf'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1116'>
+    <function-type size-in-bits='64' id='type-id-1141'>
       <parameter type-id='type-id-6' name='idtype'/>
       <parameter type-id='type-id-6' name='id'/>
       <parameter type-id='type-id-3' name='infop'/>
       <parameter type-id='type-id-6' name='options'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1117'>
+    <function-type size-in-bits='64' id='type-id-1142'>
       <parameter type-id='type-id-6' name='sig'/>
-      <parameter type-id='type-id-1173' name='act'/>
-      <parameter type-id='type-id-1173' name='old'/>
+      <parameter type-id='type-id-1197' name='act'/>
+      <parameter type-id='type-id-1197' name='old'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1105'>
+    <function-type size-in-bits='64' id='type-id-1130'>
       <parameter type-id='type-id-6' name='size'/>
-      <parameter type-id='type-id-1001' name='lst'/>
+      <parameter type-id='type-id-1019' name='lst'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1120'>
+    <function-type size-in-bits='64' id='type-id-1144'>
       <parameter type-id='type-id-6' name='option'/>
       <parameter type-id='type-id-1' name='arg2'/>
       <parameter type-id='type-id-1' name='arg3'/>
@@ -15256,309 +15253,312 @@
       <parameter type-id='type-id-1' name='arg5'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1118'>
+    <function-type size-in-bits='64' id='type-id-1128'>
       <parameter type-id='type-id-6' name='pid'/>
       <parameter type-id='type-id-412' name='cpusetsize'/>
       <parameter type-id='type-id-3' name='mask'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1119'>
+    <function-type size-in-bits='64' id='type-id-1143'>
       <parameter type-id='type-id-6' name='d'/>
       <parameter type-id='type-id-172' name='request'/>
       <parameter type-id='type-id-3' name='arg'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1121'>
+    <function-type size-in-bits='64' id='type-id-1145'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='buf'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1122'>
+    <function-type size-in-bits='64' id='type-id-1146'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='mask'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1197'>
+    <function-type size-in-bits='64' id='type-id-1191'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='msg'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-612'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1123'>
+    <function-type size-in-bits='64' id='type-id-1147'>
       <parameter type-id='type-id-6' name='sock_fd'/>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-35' name='addrlen'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1124'>
+    <function-type size-in-bits='64' id='type-id-1148'>
       <parameter type-id='type-id-6' name='epfd'/>
       <parameter type-id='type-id-3' name='ev'/>
       <parameter type-id='type-id-6' name='cnt'/>
       <parameter type-id='type-id-6' name='timeout'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1198'>
+    <function-type size-in-bits='64' id='type-id-1192'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='buf'/>
       <parameter type-id='type-id-612' name='len'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-612'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1125'>
+    <function-type size-in-bits='64' id='type-id-1149'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-172' name='addrlen'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1189'>
+    <function-type size-in-bits='64' id='type-id-944'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='ptr'/>
       <parameter type-id='type-id-412' name='count'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1126'>
+    <function-type size-in-bits='64' id='type-id-1150'>
       <parameter type-id='type-id-6' name='sockfd'/>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-178' name='addrlen'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1127'>
+    <function-type size-in-bits='64' id='type-id-1151'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-178' name='addrlen'/>
       <parameter type-id='type-id-6' name='f'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1188'>
+    <function-type size-in-bits='64' id='type-id-943'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='ptr'/>
       <parameter type-id='type-id-410' name='count'/>
       <parameter type-id='type-id-410' name='offset'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1190'>
+    <function-type size-in-bits='64' id='type-id-945'>
       <parameter type-id='type-id-6' name='fd'/>
       <parameter type-id='type-id-3' name='ptr'/>
       <parameter type-id='type-id-412' name='count'/>
       <parameter type-id='type-id-411' name='offset'/>
       <return type-id='type-id-414'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1128'>
+    <function-type size-in-bits='64' id='type-id-1152'>
       <parameter type-id='type-id-6' name='which'/>
       <parameter type-id='type-id-3' name='new_value'/>
       <parameter type-id='type-id-3' name='old_value'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1130'>
+    <function-type size-in-bits='64' id='type-id-1097'>
       <parameter type-id='type-id-2' name='thread'/>
       <parameter type-id='type-id-4' name='name'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1133'>
+    <function-type size-in-bits='64' id='type-id-1154'>
       <parameter type-id='type-id-172' name='initval'/>
       <parameter type-id='type-id-6' name='flags'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1131'>
+    <function-type size-in-bits='64' id='type-id-1098'>
       <parameter type-id='type-id-2' name='thread'/>
       <parameter type-id='type-id-35' name='policy'/>
       <parameter type-id='type-id-35' name='param'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1129'>
+    <function-type size-in-bits='64' id='type-id-1096'>
       <parameter type-id='type-id-237' name='clk_id'/>
       <parameter type-id='type-id-3' name='tp'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1134'>
-      <parameter type-id='type-id-144' name='f'/>
-      <return type-id='type-id-6'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-1135'>
+    <function-type size-in-bits='64' id='type-id-1155'>
       <parameter type-id='type-id-1207' name='f'/>
       <parameter type-id='type-id-3' name='arg'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1136'>
+    <function-type size-in-bits='64' id='type-id-1156'>
+      <parameter type-id='type-id-144' name='f'/>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-1157'>
       <parameter type-id='type-id-469' name='f'/>
       <parameter type-id='type-id-3' name='arg'/>
       <parameter type-id='type-id-3' name='dso'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1191'>
+    <function-type size-in-bits='64' id='type-id-1158'>
+      <return type-id='type-id-6'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-969'>
       <parameter type-id='type-id-3' name='tms'/>
       <return type-id='type-id-1229'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1137'>
+    <function-type size-in-bits='64' id='type-id-1160'>
       <parameter type-id='type-id-258' name='buffer'/>
       <parameter type-id='type-id-6' name='size'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1138'>
+    <function-type size-in-bits='64' id='type-id-1159'>
       <parameter type-id='type-id-258' name='memptr'/>
       <parameter type-id='type-id-2' name='align'/>
       <parameter type-id='type-id-2' name='sz'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1139'>
+    <function-type size-in-bits='64' id='type-id-1162'>
       <parameter type-id='type-id-3' name='dirp'/>
-      <parameter type-id='type-id-953' name='entry'/>
-      <parameter type-id='type-id-955' name='result'/>
+      <parameter type-id='type-id-971' name='entry'/>
+      <parameter type-id='type-id-973' name='result'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1140'>
+    <function-type size-in-bits='64' id='type-id-1163'>
       <parameter type-id='type-id-3' name='dirp'/>
-      <parameter type-id='type-id-958' name='entry'/>
-      <parameter type-id='type-id-960' name='result'/>
+      <parameter type-id='type-id-976' name='entry'/>
+      <parameter type-id='type-id-978' name='result'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1142'>
+    <function-type size-in-bits='64' id='type-id-1166'>
       <parameter type-id='type-id-3' name='stream'/>
       <parameter type-id='type-id-4' name='format'/>
-      <parameter type-id='type-id-1196' name='ap'/>
+      <parameter is-variadic='yes'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1143'>
+    <function-type size-in-bits='64' id='type-id-1167'>
       <parameter type-id='type-id-3' name='stream'/>
       <parameter type-id='type-id-4' name='format'/>
-      <parameter is-variadic='yes'/>
+      <parameter type-id='type-id-1199' name='ap'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1144'>
+    <function-type size-in-bits='64' id='type-id-1168'>
       <parameter type-id='type-id-3' name='buffer'/>
-      <parameter type-id='type-id-1061' name='result'/>
+      <parameter type-id='type-id-1083' name='result'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1145'>
+    <function-type size-in-bits='64' id='type-id-1169'>
       <parameter type-id='type-id-3' name='tid'/>
       <parameter type-id='type-id-6' name='sig'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1152'>
+    <function-type size-in-bits='64' id='type-id-1174'>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-612' name='sz'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1146'>
+    <function-type size-in-bits='64' id='type-id-1170'>
       <parameter type-id='type-id-3' name='s'/>
       <parameter type-id='type-id-35' name='sval'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1149'>
+    <function-type size-in-bits='64' id='type-id-1173'>
       <parameter type-id='type-id-3' name='buffer'/>
-      <parameter type-id='type-id-1168' name='result'/>
+      <parameter type-id='type-id-1190' name='result'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1147'>
+    <function-type size-in-bits='64' id='type-id-1171'>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-6' name='len'/>
       <parameter type-id='type-id-6' name='type'/>
-      <parameter type-id='type-id-967' name='ret'/>
+      <parameter type-id='type-id-985' name='ret'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='buflen'/>
-      <parameter type-id='type-id-972' name='result'/>
+      <parameter type-id='type-id-990' name='result'/>
       <parameter type-id='type-id-35' name='h_errnop'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1148'>
+    <function-type size-in-bits='64' id='type-id-1172'>
       <parameter type-id='type-id-3' name='s'/>
       <parameter type-id='type-id-6' name='pshared'/>
       <parameter type-id='type-id-172' name='value'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1141'>
+    <function-type size-in-bits='64' id='type-id-1164'>
       <parameter type-id='type-id-3' name='buf'/>
-      <parameter type-id='type-id-1001' name='result'/>
+      <parameter type-id='type-id-1019' name='result'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1151'>
+    <function-type size-in-bits='64' id='type-id-1165'>
       <parameter type-id='type-id-3' name='addr'/>
       <parameter type-id='type-id-2' name='len'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1150'>
+    <function-type size-in-bits='64' id='type-id-1161'>
       <parameter type-id='type-id-3' name='attr'/>
       <parameter type-id='type-id-412' name='cpusetsize'/>
       <parameter type-id='type-id-3' name='cpuset'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1153'>
+    <function-type size-in-bits='64' id='type-id-1175'>
       <parameter type-id='type-id-3' name='o'/>
       <parameter type-id='type-id-144' name='f'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1154'>
+    <function-type size-in-bits='64' id='type-id-1176'>
       <parameter type-id='type-id-3' name='th'/>
       <parameter type-id='type-id-258' name='ret'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1155'>
+    <function-type size-in-bits='64' id='type-id-1177'>
       <parameter type-id='type-id-3' name='attr'/>
       <parameter type-id='type-id-258' name='addr'/>
-      <parameter type-id='type-id-928' name='size'/>
+      <parameter type-id='type-id-937' name='size'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1156'>
+    <function-type size-in-bits='64' id='type-id-1178'>
       <parameter type-id='type-id-3' name='s1'/>
       <parameter type-id='type-id-3' name='s2'/>
       <parameter type-id='type-id-2' name='n'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1157'>
+    <function-type size-in-bits='64' id='type-id-1179'>
       <parameter type-id='type-id-3' name='b'/>
       <parameter type-id='type-id-3' name='a'/>
       <parameter type-id='type-id-172' name='count'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1158'>
+    <function-type size-in-bits='64' id='type-id-1180'>
       <parameter type-id='type-id-3' name='th'/>
       <parameter type-id='type-id-3' name='attr'/>
       <parameter type-id='type-id-1218' name='callback'/>
       <parameter type-id='type-id-3' name='param'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1159'>
+    <function-type size-in-bits='64' id='type-id-1181'>
       <parameter type-id='type-id-3' name='c'/>
       <parameter type-id='type-id-3' name='m'/>
       <parameter type-id='type-id-3' name='abstime'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1160'>
+    <function-type size-in-bits='64' id='type-id-1182'>
       <parameter type-id='type-id-3' name='node'/>
       <parameter type-id='type-id-3' name='service'/>
       <parameter type-id='type-id-3' name='hints'/>
       <parameter type-id='type-id-3' name='rv'/>
       <return type-id='type-id-6'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1175'>
+    <function-type size-in-bits='64' id='type-id-929'>
       <parameter type-id='type-id-28' name='dest'/>
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <parameter type-id='type-id-412' name='nms'/>
       <parameter type-id='type-id-412' name='len'/>
       <parameter type-id='type-id-3' name='ps'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1176'>
+    <function-type size-in-bits='64' id='type-id-930'>
       <parameter type-id='type-id-28' name='dest'/>
-      <parameter type-id='type-id-1056' name='src'/>
+      <parameter type-id='type-id-1078' name='src'/>
       <parameter type-id='type-id-412' name='len'/>
       <parameter type-id='type-id-3' name='ps'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1177'>
+    <function-type size-in-bits='64' id='type-id-931'>
       <parameter type-id='type-id-28' name='dest'/>
-      <parameter type-id='type-id-1055' name='src'/>
+      <parameter type-id='type-id-1077' name='src'/>
       <parameter type-id='type-id-412' name='len'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1178'>
+    <function-type size-in-bits='64' id='type-id-932'>
       <parameter type-id='type-id-6' name='name'/>
       <parameter type-id='type-id-28' name='buf'/>
       <parameter type-id='type-id-412' name='len'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1193'>
+    <function-type size-in-bits='64' id='type-id-1021'>
       <parameter type-id='type-id-6' name='request'/>
       <parameter type-id='type-id-6' name='pid'/>
       <parameter type-id='type-id-3' name='addr'/>
@@ -15573,26 +15573,26 @@
       <parameter type-id='type-id-137' name='t'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1194'>
+    <function-type size-in-bits='64' id='type-id-1022'>
       <parameter type-id='type-id-3' name='p'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1179'>
+    <function-type size-in-bits='64' id='type-id-933'>
       <parameter type-id='type-id-3' name='cd'/>
-      <parameter type-id='type-id-1021' name='inbuf'/>
-      <parameter type-id='type-id-928' name='inbytesleft'/>
-      <parameter type-id='type-id-1021' name='outbuf'/>
-      <parameter type-id='type-id-928' name='outbytesleft'/>
+      <parameter type-id='type-id-1043' name='inbuf'/>
+      <parameter type-id='type-id-937' name='inbytesleft'/>
+      <parameter type-id='type-id-1043' name='outbuf'/>
+      <parameter type-id='type-id-937' name='outbytesleft'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1195'>
+    <function-type size-in-bits='64' id='type-id-1023'>
       <parameter type-id='type-id-3' name='p'/>
       <parameter type-id='type-id-2' name='size'/>
       <parameter type-id='type-id-2' name='nmemb'/>
       <parameter type-id='type-id-3' name='f'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1180'>
+    <function-type size-in-bits='64' id='type-id-934'>
       <parameter type-id='type-id-1225' name='dest'/>
       <parameter type-id='type-id-358' name='src'/>
       <parameter type-id='type-id-412' name='nms'/>
@@ -15600,45 +15600,45 @@
       <parameter type-id='type-id-3' name='ps'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1181'>
+    <function-type size-in-bits='64' id='type-id-935'>
       <parameter type-id='type-id-1225' name='dest'/>
       <parameter type-id='type-id-358' name='src'/>
       <parameter type-id='type-id-412' name='len'/>
       <parameter type-id='type-id-3' name='ps'/>
       <return type-id='type-id-412'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1182'>
+    <function-type size-in-bits='64' id='type-id-936'>
       <parameter type-id='type-id-1225' name='dest'/>
       <parameter type-id='type-id-4' name='src'/>
       <parameter type-id='type-id-412' name='len'/>
       <return type-id='type-id-412'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-1198'>
+      <parameter type-id='type-id-6' name='sig'/>
+      <parameter type-id='type-id-402' name='h'/>
+      <return type-id='type-id-402'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-1203'>
       <parameter type-id='type-id-378' name='x'/>
-      <parameter type-id='type-id-1061' name='sin'/>
-      <parameter type-id='type-id-1061' name='cos'/>
+      <parameter type-id='type-id-1083' name='sin'/>
+      <parameter type-id='type-id-1083' name='cos'/>
       <return type-id='type-id-27'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1208'>
       <parameter type-id='type-id-383' name='x'/>
-      <parameter type-id='type-id-1167' name='sin'/>
-      <parameter type-id='type-id-1167' name='cos'/>
+      <parameter type-id='type-id-1189' name='sin'/>
+      <parameter type-id='type-id-1189' name='cos'/>
       <return type-id='type-id-27'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1204'>
       <parameter type-id='type-id-379' name='x'/>
-      <parameter type-id='type-id-1066' name='sin'/>
-      <parameter type-id='type-id-1066' name='cos'/>
+      <parameter type-id='type-id-1088' name='sin'/>
+      <parameter type-id='type-id-1088' name='cos'/>
       <return type-id='type-id-27'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1199'>
-      <parameter type-id='type-id-6' name='sig'/>
-      <parameter type-id='type-id-402' name='h'/>
-      <return type-id='type-id-402'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-1205'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-1169'/>
+      <parameter type-id='type-id-1193'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-27'/>
     </function-type>
@@ -15657,33 +15657,33 @@
       <parameter type-id='type-id-112' name='free_addr'/>
       <return type-id='type-id-27'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1210'>
+    <function-type size-in-bits='64' id='type-id-1212'>
       <parameter type-id='type-id-28' name='path'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1211'>
+    <function-type size-in-bits='64' id='type-id-1213'>
       <parameter type-id='type-id-28' name='path'/>
       <parameter type-id='type-id-28' name='mode'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1212'>
+    <function-type size-in-bits='64' id='type-id-1214'>
       <parameter type-id='type-id-28' name='path'/>
       <parameter type-id='type-id-28' name='mode'/>
       <parameter type-id='type-id-3' name='stream'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1213'>
+    <function-type size-in-bits='64' id='type-id-1215'>
       <parameter type-id='type-id-28' name='s'/>
       <parameter type-id='type-id-6' name='c'/>
       <parameter type-id='type-id-2' name='n'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1214'>
+    <function-type size-in-bits='64' id='type-id-1216'>
       <parameter type-id='type-id-4' name='filename'/>
       <parameter type-id='type-id-6' name='flag'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1215'>
+    <function-type size-in-bits='64' id='type-id-1210'>
       <parameter type-id='type-id-2' name='sz'/>
       <return type-id='type-id-3'/>
     </function-type>
@@ -15709,16 +15709,16 @@
       <parameter type-id='type-id-172' name='off'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1220'>
+    <function-type size-in-bits='64' id='type-id-1219'>
       <parameter type-id='type-id-3' name='p'/>
       <parameter type-id='type-id-2' name='size'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1013'>
+    <function-type size-in-bits='64' id='type-id-1035'>
       <parameter type-id='type-id-4' name='str'/>
       <return type-id='type-id-28'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1192'>
+    <function-type size-in-bits='64' id='type-id-1020'>
       <parameter type-id='type-id-4' name='s'/>
       <return type-id='type-id-2'/>
     </function-type>
@@ -15726,12 +15726,12 @@
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-27'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1216'>
+    <function-type size-in-bits='64' id='type-id-1211'>
       <parameter type-id='type-id-2' name='align'/>
       <parameter type-id='type-id-2' name='sz'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1219'>
+    <function-type size-in-bits='64' id='type-id-1220'>
       <parameter type-id='type-id-3' name='dst'/>
       <parameter type-id='type-id-6' name='v'/>
       <parameter type-id='type-id-2' name='size'/>
@@ -16373,7 +16373,7 @@
     <pointer-type-def type-id='type-id-1353' size-in-bits='64' id='type-id-1354'/>
     <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-1356'/>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-1357'/>
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-935'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-952'/>
     <pointer-type-def type-id='type-id-1236' size-in-bits='64' id='type-id-1240'/>
     <pointer-type-def type-id='type-id-1358' size-in-bits='64' id='type-id-332'/>
     <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-1359'/>
@@ -17968,7 +17968,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-933'>
+      <class-decl name='Suppression' size-in-bits='256' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='30' column='1' id='type-id-950'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='type' type-id='type-id-195' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_suppressions.h' line='31' column='1'/>
         </data-member>
@@ -19769,7 +19769,7 @@
           <var-decl name='pc' type-id='type-id-2' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='522' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='supp' type-id='type-id-935' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
+          <var-decl name='supp' type-id='type-id-952' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_rtl.h' line='523' column='1'/>
         </data-member>
       </class-decl>
       <class-decl name='Flags' size-in-bits='960' is-struct='yes' visibility='default' filepath='../../.././libsanitizer/tsan/tsan_flags.h' line='25' column='1' id='type-id-1375'>
@@ -21865,8 +21865,8 @@
     <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-1230'/>
     <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-1571'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-1572' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-312'/>
     <namespace-decl name='__sanitizer'>
       <class-decl name='InternalMmapVector&lt;int&gt;' size-in-bits='192' visibility='default' filepath='../../.././libsanitizer/sanitizer_common/sanitizer_common.h' line='320' column='1' id='type-id-1555'>
         <data-member access='private' layout-offset-in-bits='0'>
@@ -22120,12 +22120,12 @@
         <return type-id='type-id-354'/>
       </function-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-1572'>
+    <function-type size-in-bits='64' id='type-id-1573'>
       <parameter type-id='type-id-1568'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-27'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1573'>
+    <function-type size-in-bits='64' id='type-id-1572'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-112'/>
@@ -23224,7 +23224,7 @@
     <pointer-type-def type-id='type-id-1669' size-in-bits='64' id='type-id-103'/>
     <qualified-type-def type-id='type-id-1670' const='yes' id='type-id-1671'/>
     <pointer-type-def type-id='type-id-1671' size-in-bits='64' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-157'/>
     <pointer-type-def type-id='type-id-1247' size-in-bits='64' id='type-id-469'/>
     <pointer-type-def type-id='type-id-3' size-in-bits='64' id='type-id-258'/>
     <qualified-type-def type-id='type-id-1281' volatile='yes' id='type-id-1668'/>
@@ -25545,10 +25545,10 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../.././libsanitizer/tsan/tsan_suppressions.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-ImG4Cf/gcc-4.9.2/x86_64-unknown-linux-gnu/libsanitizer/tsan' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-952' const='yes' id='type-id-1722'/>
     <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-1722' size-in-bits='64' id='type-id-1723'/>
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-193'/>
+    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-193'/>
     <qualified-type-def type-id='type-id-188' const='yes' id='type-id-1724'/>
     <reference-type-def kind='lvalue' type-id='type-id-1724' size-in-bits='64' id='type-id-191'/>
     <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-192'/>
@@ -25913,7 +25913,7 @@
     </namespace-decl>
     <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-1021'/>
+      <parameter type-id='type-id-1043'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-41'/>
     </function-decl>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index a7cc8997..fff19e37 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1791,14 +1791,10 @@
       <subrange length='255' lower-bound='0' upper-bound='254' type-id='type-id-38' id='type-id-43'/>
     </array-type-def>
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-44'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-45'/>
-    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-46'/>
-    <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-47'/>
-    <qualified-type-def type-id='type-id-25' const='yes' id='type-id-48'/>
-    <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-49'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-51'/>
-    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-52'/>
+    <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-46'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-48'/>
+    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-50'/>
+    <pointer-type-def type-id='type-id-51' size-in-bits='64' id='type-id-52'/>
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-54'/>
     <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-56'/>
     <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-58'/>
@@ -1824,12 +1820,16 @@
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-98'/>
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-100'/>
     <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-106'/>
-    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-103'/>
+    <qualified-type-def type-id='type-id-23' const='yes' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
+    <qualified-type-def type-id='type-id-25' const='yes' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-111'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-114'/>
     <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-116'/>
     <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-118'/>
@@ -1866,51 +1866,55 @@
     <typedef-decl name='COIMAPINSTANCE' type-id='type-id-140' filepath='../../../gcc/liboffloadmic/include/coi/common/../common/COITypes_common.h' line='72' column='1' id='type-id-125'/>
     <namespace-decl name='COI'>
       <var-decl name='is_available' type-id='type-id-149' mangled-name='_ZN3COI12is_availableE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='60' column='1'/>
-      <var-decl name='EngineGetCount' type-id='type-id-100' mangled-name='_ZN3COI14EngineGetCountE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='63' column='1'/>
-      <var-decl name='EngineGetHandle' type-id='type-id-98' mangled-name='_ZN3COI15EngineGetHandleE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='64' column='1'/>
-      <var-decl name='ProcessCreateFromMemory' type-id='type-id-72' mangled-name='_ZN3COI23ProcessCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='66' column='1'/>
-      <var-decl name='ProcessCreateFromFile' type-id='type-id-70' mangled-name='_ZN3COI21ProcessCreateFromFileE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='74' column='1'/>
-      <var-decl name='ProcessSetCacheSize' type-id='type-id-92' mangled-name='_ZN3COI19ProcessSetCacheSizeE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='82' column='1'/>
-      <var-decl name='ProcessDestroy' type-id='type-id-86' mangled-name='_ZN3COI14ProcessDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='85' column='1'/>
-      <var-decl name='ProcessGetFunctionHandles' type-id='type-id-88' mangled-name='_ZN3COI25ProcessGetFunctionHandlesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='87' column='1'/>
-      <var-decl name='ProcessLoadLibraryFromMemory' type-id='type-id-96' mangled-name='_ZN3COI28ProcessLoadLibraryFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='90' column='1'/>
-      <var-decl name='ProcessUnloadLibrary' type-id='type-id-84' mangled-name='_ZN3COI20ProcessUnloadLibraryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='100' column='1'/>
-      <var-decl name='ProcessRegisterLibraries' type-id='type-id-104' mangled-name='_ZN3COI24ProcessRegisterLibrariesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='103' column='1'/>
-      <var-decl name='PipelineCreate' type-id='type-id-94' mangled-name='_ZN3COI14PipelineCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='109' column='1'/>
-      <var-decl name='PipelineDestroy' type-id='type-id-80' mangled-name='_ZN3COI15PipelineDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='111' column='1'/>
-      <var-decl name='PipelineRunFunction' type-id='type-id-82' mangled-name='_ZN3COI19PipelineRunFunctionE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='112' column='1'/>
-      <var-decl name='BufferCreate' type-id='type-id-108' mangled-name='_ZN3COI12BufferCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='119' column='1'/>
-      <var-decl name='BufferCreateFromMemory' type-id='type-id-108' mangled-name='_ZN3COI22BufferCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='122' column='1'/>
-      <var-decl name='BufferDestroy' type-id='type-id-54' mangled-name='_ZN3COI13BufferDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='126' column='1'/>
-      <var-decl name='BufferMap' type-id='type-id-62' mangled-name='_ZN3COI9BufferMapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='127' column='1'/>
-      <var-decl name='BufferUnmap' type-id='type-id-78' mangled-name='_ZN3COI11BufferUnmapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='130' column='1'/>
-      <var-decl name='BufferWrite' type-id='type-id-64' mangled-name='_ZN3COI11BufferWriteE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='132' column='1'/>
-      <var-decl name='BufferRead' type-id='type-id-64' mangled-name='_ZN3COI10BufferReadE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='135' column='1'/>
-      <var-decl name='BufferReadMultiD' type-id='type-id-66' mangled-name='_ZN3COI16BufferReadMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='138' column='1'/>
-      <var-decl name='BufferWriteMultiD' type-id='type-id-60' mangled-name='_ZN3COI17BufferWriteMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='141' column='1'/>
-      <var-decl name='BufferCopy' type-id='type-id-56' mangled-name='_ZN3COI10BufferCopyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='145' column='1'/>
-      <var-decl name='BufferGetSinkAddress' type-id='type-id-68' mangled-name='_ZN3COI20BufferGetSinkAddressE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='148' column='1'/>
-      <var-decl name='BufferSetState' type-id='type-id-58' mangled-name='_ZN3COI14BufferSetStateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='149' column='1'/>
-      <var-decl name='EventWait' type-id='type-id-102' mangled-name='_ZN3COI9EventWaitE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='153' column='1'/>
-      <var-decl name='PerfGetCycleFrequency' type-id='type-id-112' mangled-name='_ZN3COI21PerfGetCycleFrequencyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='156' column='1'/>
-      <var-decl name='ProcessConfigureDMA' type-id='type-id-106' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
-      <var-decl name='PipelineClearCPUMask' type-id='type-id-110' mangled-name='_ZN3COI20PipelineClearCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='160' column='1' elf-symbol-id='_ZN3COI20PipelineClearCPUMaskE'/>
-      <var-decl name='PipelineSetCPUMask' type-id='type-id-90' mangled-name='_ZN3COI18PipelineSetCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='162' column='1' elf-symbol-id='_ZN3COI18PipelineSetCPUMaskE'/>
-      <var-decl name='EngineGetInfo' type-id='type-id-74' mangled-name='_ZN3COI13EngineGetInfoE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='164' column='1' elf-symbol-id='_ZN3COI13EngineGetInfoE'/>
-      <var-decl name='EventRegisterCallback' type-id='type-id-76' mangled-name='_ZN3COI21EventRegisterCallbackE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='166' column='1' elf-symbol-id='_ZN3COI21EventRegisterCallbackE'/>
+      <var-decl name='EngineGetCount' type-id='type-id-90' mangled-name='_ZN3COI14EngineGetCountE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='63' column='1'/>
+      <var-decl name='EngineGetHandle' type-id='type-id-92' mangled-name='_ZN3COI15EngineGetHandleE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='64' column='1'/>
+      <var-decl name='ProcessCreateFromMemory' type-id='type-id-64' mangled-name='_ZN3COI23ProcessCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='66' column='1'/>
+      <var-decl name='ProcessCreateFromFile' type-id='type-id-62' mangled-name='_ZN3COI21ProcessCreateFromFileE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='74' column='1'/>
+      <var-decl name='ProcessSetCacheSize' type-id='type-id-86' mangled-name='_ZN3COI19ProcessSetCacheSizeE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='82' column='1'/>
+      <var-decl name='ProcessDestroy' type-id='type-id-78' mangled-name='_ZN3COI14ProcessDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='85' column='1'/>
+      <var-decl name='ProcessGetFunctionHandles' type-id='type-id-80' mangled-name='_ZN3COI25ProcessGetFunctionHandlesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='87' column='1'/>
+      <var-decl name='ProcessLoadLibraryFromMemory' type-id='type-id-88' mangled-name='_ZN3COI28ProcessLoadLibraryFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='90' column='1'/>
+      <var-decl name='ProcessUnloadLibrary' type-id='type-id-76' mangled-name='_ZN3COI20ProcessUnloadLibraryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='100' column='1'/>
+      <var-decl name='ProcessRegisterLibraries' type-id='type-id-96' mangled-name='_ZN3COI24ProcessRegisterLibrariesE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='103' column='1'/>
+      <var-decl name='PipelineCreate' type-id='type-id-84' mangled-name='_ZN3COI14PipelineCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='109' column='1'/>
+      <var-decl name='PipelineDestroy' type-id='type-id-72' mangled-name='_ZN3COI15PipelineDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='111' column='1'/>
+      <var-decl name='PipelineRunFunction' type-id='type-id-74' mangled-name='_ZN3COI19PipelineRunFunctionE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='112' column='1'/>
+      <var-decl name='BufferCreate' type-id='type-id-100' mangled-name='_ZN3COI12BufferCreateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='119' column='1'/>
+      <var-decl name='BufferCreateFromMemory' type-id='type-id-100' mangled-name='_ZN3COI22BufferCreateFromMemoryE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='122' column='1'/>
+      <var-decl name='BufferDestroy' type-id='type-id-46' mangled-name='_ZN3COI13BufferDestroyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='126' column='1'/>
+      <var-decl name='BufferMap' type-id='type-id-56' mangled-name='_ZN3COI9BufferMapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='127' column='1'/>
+      <var-decl name='BufferUnmap' type-id='type-id-70' mangled-name='_ZN3COI11BufferUnmapE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='130' column='1'/>
+      <var-decl name='BufferWrite' type-id='type-id-58' mangled-name='_ZN3COI11BufferWriteE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='132' column='1'/>
+      <var-decl name='BufferRead' type-id='type-id-58' mangled-name='_ZN3COI10BufferReadE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='135' column='1'/>
+      <var-decl name='BufferReadMultiD' type-id='type-id-60' mangled-name='_ZN3COI16BufferReadMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='138' column='1'/>
+      <var-decl name='BufferWriteMultiD' type-id='type-id-52' mangled-name='_ZN3COI17BufferWriteMultiDE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='141' column='1'/>
+      <var-decl name='BufferCopy' type-id='type-id-48' mangled-name='_ZN3COI10BufferCopyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='145' column='1'/>
+      <var-decl name='BufferGetSinkAddress' type-id='type-id-54' mangled-name='_ZN3COI20BufferGetSinkAddressE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='148' column='1'/>
+      <var-decl name='BufferSetState' type-id='type-id-50' mangled-name='_ZN3COI14BufferSetStateE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='149' column='1'/>
+      <var-decl name='EventWait' type-id='type-id-94' mangled-name='_ZN3COI9EventWaitE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='153' column='1'/>
+      <var-decl name='PerfGetCycleFrequency' type-id='type-id-113' mangled-name='_ZN3COI21PerfGetCycleFrequencyE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='156' column='1'/>
+      <var-decl name='ProcessConfigureDMA' type-id='type-id-102' mangled-name='_ZN3COI19ProcessConfigureDMAE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='158' column='1'/>
+      <var-decl name='PipelineClearCPUMask' type-id='type-id-98' mangled-name='_ZN3COI20PipelineClearCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='160' column='1' elf-symbol-id='_ZN3COI20PipelineClearCPUMaskE'/>
+      <var-decl name='PipelineSetCPUMask' type-id='type-id-82' mangled-name='_ZN3COI18PipelineSetCPUMaskE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='162' column='1' elf-symbol-id='_ZN3COI18PipelineSetCPUMaskE'/>
+      <var-decl name='EngineGetInfo' type-id='type-id-66' mangled-name='_ZN3COI13EngineGetInfoE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='164' column='1' elf-symbol-id='_ZN3COI13EngineGetInfoE'/>
+      <var-decl name='EventRegisterCallback' type-id='type-id-68' mangled-name='_ZN3COI21EventRegisterCallbackE' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/coi/coi_client.h' line='166' column='1' elf-symbol-id='_ZN3COI21EventRegisterCallbackE'/>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-75'>
-      <parameter type-id='type-id-23'/>
-      <parameter type-id='type-id-116'/>
-      <parameter type-id='type-id-150'/>
-      <parameter type-id='type-id-19'/>
+    <function-type size-in-bits='64' id='type-id-89'>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-111'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-53'>
+    <function-type size-in-bits='64' id='type-id-91'>
+      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-120'/>
+      <return type-id='type-id-24'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-45'>
       <parameter type-id='type-id-117'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-55'>
+    <function-type size-in-bits='64' id='type-id-47'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-19'/>
@@ -1918,21 +1922,21 @@
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-57'>
+    <function-type size-in-bits='64' id='type-id-49'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-4'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-59'>
+    <function-type size-in-bits='64' id='type-id-51'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-19'/>
@@ -1940,50 +1944,50 @@
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-67'>
+    <function-type size-in-bits='64' id='type-id-53'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-61'>
+    <function-type size-in-bits='64' id='type-id-55'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <parameter type-id='type-id-126'/>
       <parameter type-id='type-id-151'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-63'>
+    <function-type size-in-bits='64' id='type-id-57'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-65'>
+    <function-type size-in-bits='64' id='type-id-59'>
       <parameter type-id='type-id-117'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-27'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-69'>
+    <function-type size-in-bits='64' id='type-id-61'>
       <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-30'/>
@@ -1997,7 +2001,7 @@
       <parameter type-id='type-id-130'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-71'>
+    <function-type size-in-bits='64' id='type-id-63'>
       <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-150'/>
@@ -2015,31 +2019,38 @@
       <parameter type-id='type-id-130'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-73'>
+    <function-type size-in-bits='64' id='type-id-65'>
       <parameter type-id='type-id-119'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-103'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-77'>
+    <function-type size-in-bits='64' id='type-id-67'>
+      <parameter type-id='type-id-23'/>
+      <parameter type-id='type-id-116'/>
+      <parameter type-id='type-id-150'/>
+      <parameter type-id='type-id-19'/>
+      <return type-id='type-id-24'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-69'>
       <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-79'>
+    <function-type size-in-bits='64' id='type-id-71'>
       <parameter type-id='type-id-127'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-81'>
+    <function-type size-in-bits='64' id='type-id-73'>
       <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-121'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-146'/>
-      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-107'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-150'/>
@@ -2047,52 +2058,52 @@
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-83'>
+    <function-type size-in-bits='64' id='type-id-75'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-123'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-85'>
+    <function-type size-in-bits='64' id='type-id-77'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-113'/>
+      <parameter type-id='type-id-110'/>
+      <parameter type-id='type-id-111'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-93'>
+    <function-type size-in-bits='64' id='type-id-83'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-114'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-128'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-87'>
+    <function-type size-in-bits='64' id='type-id-79'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-122'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-89'>
+    <function-type size-in-bits='64' id='type-id-81'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-91'>
+    <function-type size-in-bits='64' id='type-id-85'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-44'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-95'>
+    <function-type size-in-bits='64' id='type-id-87'>
       <parameter type-id='type-id-129'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-19'/>
@@ -2104,31 +2115,11 @@
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-99'>
-      <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-113'/>
-      <return type-id='type-id-24'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-97'>
-      <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-120'/>
-      <return type-id='type-id-24'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-109'>
       <parameter type-id='type-id-114'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-101'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-47'/>
-      <parameter type-id='type-id-31'/>
-      <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-113'/>
-      <parameter type-id='type-id-113'/>
-      <return type-id='type-id-24'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-107'>
+    <function-type size-in-bits='64' id='type-id-99'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-17'/>
@@ -2138,20 +2129,29 @@
       <parameter type-id='type-id-118'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-105'>
+    <function-type size-in-bits='64' id='type-id-93'>
+      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-37'/>
+      <parameter type-id='type-id-111'/>
+      <parameter type-id='type-id-111'/>
+      <return type-id='type-id-24'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-101'>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-103'>
+    <function-type size-in-bits='64' id='type-id-95'>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-151'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-109'/>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-109'/>
       <return type-id='type-id-24'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-111'>
+    <function-type size-in-bits='64' id='type-id-112'>
       <return type-id='type-id-19'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-115'>
@@ -2820,7 +2820,7 @@
           <parameter type-id='type-id-150'/>
           <parameter type-id='type-id-20'/>
           <parameter type-id='type-id-17'/>
-          <parameter type-id='type-id-47'/>
+          <parameter type-id='type-id-105'/>
           <parameter type-id='type-id-44'/>
           <return type-id='type-id-24'/>
         </function-decl>
@@ -3490,7 +3490,7 @@
       <member-function access='private'>
         <function-decl name='register_omp_event_call_back' mangled-name='_ZN17OffloadDescriptor28register_omp_event_call_backEPK8coieventPKv' filepath='../../../gcc/liboffloadmic/runtime/offload_host.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN17OffloadDescriptor28register_omp_event_call_backEPK8coieventPKv'>
           <parameter type-id='type-id-219' is-artificial='yes'/>
-          <parameter type-id='type-id-47'/>
+          <parameter type-id='type-id-105'/>
           <parameter type-id='type-id-150'/>
           <return type-id='type-id-154'/>
         </function-decl>
@@ -19141,42 +19141,45 @@
     <pointer-type-def type-id='type-id-2929' size-in-bits='64' id='type-id-2930'/>
     <pointer-type-def type-id='type-id-2931' size-in-bits='64' id='type-id-2932'/>
     <pointer-type-def type-id='type-id-2902' size-in-bits='64' id='type-id-2922'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2926' size-in-bits='64' id='type-id-2933'/>
+    <pointer-type-def type-id='type-id-2933' size-in-bits='64' id='type-id-2916'/>
+    <pointer-type-def type-id='type-id-2934' size-in-bits='64' id='type-id-2913'/>
+    <pointer-type-def type-id='type-id-2935' size-in-bits='64' id='type-id-2912'/>
+    <pointer-type-def type-id='type-id-2936' size-in-bits='64' id='type-id-2917'/>
+    <pointer-type-def type-id='type-id-2937' size-in-bits='64' id='type-id-2907'/>
+    <pointer-type-def type-id='type-id-2938' size-in-bits='64' id='type-id-2908'/>
+    <pointer-type-def type-id='type-id-2939' size-in-bits='64' id='type-id-2909'/>
+    <pointer-type-def type-id='type-id-2940' size-in-bits='64' id='type-id-2903'/>
+    <pointer-type-def type-id='type-id-2941' size-in-bits='64' id='type-id-2910'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2926' size-in-bits='64' id='type-id-2942'/>
     <pointer-type-def type-id='type-id-2926' size-in-bits='64' id='type-id-2928'/>
     <pointer-type-def type-id='type-id-2901' size-in-bits='64' id='type-id-2918'/>
-    <pointer-type-def type-id='type-id-2934' size-in-bits='64' id='type-id-2927'/>
-    <pointer-type-def type-id='type-id-2935' size-in-bits='64' id='type-id-2936'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2937' size-in-bits='64' id='type-id-2938'/>
-    <pointer-type-def type-id='type-id-2939' size-in-bits='64' id='type-id-2940'/>
-    <pointer-type-def type-id='type-id-2941' size-in-bits='64' id='type-id-2942'/>
-    <qualified-type-def type-id='type-id-2926' const='yes' id='type-id-2943'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2943' size-in-bits='64' id='type-id-2944'/>
-    <pointer-type-def type-id='type-id-2943' size-in-bits='64' id='type-id-2945'/>
-    <qualified-type-def type-id='type-id-2901' const='yes' id='type-id-2946'/>
-    <pointer-type-def type-id='type-id-2946' size-in-bits='64' id='type-id-2919'/>
-    <qualified-type-def type-id='type-id-2935' const='yes' id='type-id-2947'/>
-    <pointer-type-def type-id='type-id-2947' size-in-bits='64' id='type-id-2948'/>
-    <qualified-type-def type-id='type-id-2937' const='yes' id='type-id-2949'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2949' size-in-bits='64' id='type-id-2950'/>
-    <qualified-type-def type-id='type-id-2939' const='yes' id='type-id-2951'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2951' size-in-bits='64' id='type-id-2952'/>
-    <pointer-type-def type-id='type-id-2951' size-in-bits='64' id='type-id-2953'/>
-    <qualified-type-def type-id='type-id-2941' const='yes' id='type-id-2954'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2954' size-in-bits='64' id='type-id-2955'/>
-    <pointer-type-def type-id='type-id-2954' size-in-bits='64' id='type-id-2956'/>
-    <qualified-type-def type-id='type-id-2957' const='yes' id='type-id-2958'/>
-    <pointer-type-def type-id='type-id-2958' size-in-bits='64' id='type-id-2959'/>
-    <qualified-type-def type-id='type-id-2960' const='yes' id='type-id-2961'/>
+    <pointer-type-def type-id='type-id-2943' size-in-bits='64' id='type-id-2911'/>
+    <pointer-type-def type-id='type-id-2944' size-in-bits='64' id='type-id-2927'/>
+    <pointer-type-def type-id='type-id-2945' size-in-bits='64' id='type-id-2946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2947' size-in-bits='64' id='type-id-2948'/>
+    <pointer-type-def type-id='type-id-2949' size-in-bits='64' id='type-id-2950'/>
+    <pointer-type-def type-id='type-id-2951' size-in-bits='64' id='type-id-2952'/>
+    <qualified-type-def type-id='type-id-2926' const='yes' id='type-id-2953'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2953' size-in-bits='64' id='type-id-2954'/>
+    <pointer-type-def type-id='type-id-2953' size-in-bits='64' id='type-id-2955'/>
+    <qualified-type-def type-id='type-id-2901' const='yes' id='type-id-2956'/>
+    <pointer-type-def type-id='type-id-2956' size-in-bits='64' id='type-id-2919'/>
+    <qualified-type-def type-id='type-id-2945' const='yes' id='type-id-2957'/>
+    <pointer-type-def type-id='type-id-2957' size-in-bits='64' id='type-id-2958'/>
+    <qualified-type-def type-id='type-id-2947' const='yes' id='type-id-2959'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2959' size-in-bits='64' id='type-id-2960'/>
+    <qualified-type-def type-id='type-id-2949' const='yes' id='type-id-2961'/>
     <reference-type-def kind='lvalue' type-id='type-id-2961' size-in-bits='64' id='type-id-2962'/>
-    <qualified-type-def type-id='type-id-2963' const='yes' id='type-id-2964'/>
+    <pointer-type-def type-id='type-id-2961' size-in-bits='64' id='type-id-2963'/>
+    <qualified-type-def type-id='type-id-2951' const='yes' id='type-id-2964'/>
     <reference-type-def kind='lvalue' type-id='type-id-2964' size-in-bits='64' id='type-id-2965'/>
-    <qualified-type-def type-id='type-id-2966' const='yes' id='type-id-2967'/>
-    <pointer-type-def type-id='type-id-2967' size-in-bits='64' id='type-id-2968'/>
-    <qualified-type-def type-id='type-id-2969' const='yes' id='type-id-2970'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2970' size-in-bits='64' id='type-id-2971'/>
-    <qualified-type-def type-id='type-id-2972' const='yes' id='type-id-2973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2973' size-in-bits='64' id='type-id-2974'/>
-    <pointer-type-def type-id='type-id-2973' size-in-bits='64' id='type-id-2975'/>
+    <pointer-type-def type-id='type-id-2964' size-in-bits='64' id='type-id-2966'/>
+    <qualified-type-def type-id='type-id-2967' const='yes' id='type-id-2968'/>
+    <pointer-type-def type-id='type-id-2968' size-in-bits='64' id='type-id-2969'/>
+    <qualified-type-def type-id='type-id-2970' const='yes' id='type-id-2971'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2971' size-in-bits='64' id='type-id-2972'/>
+    <qualified-type-def type-id='type-id-2973' const='yes' id='type-id-2974'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2974' size-in-bits='64' id='type-id-2975'/>
     <qualified-type-def type-id='type-id-2976' const='yes' id='type-id-2977'/>
     <pointer-type-def type-id='type-id-2977' size-in-bits='64' id='type-id-2978'/>
     <qualified-type-def type-id='type-id-2979' const='yes' id='type-id-2980'/>
@@ -19185,45 +19188,42 @@
     <reference-type-def kind='lvalue' type-id='type-id-2983' size-in-bits='64' id='type-id-2984'/>
     <pointer-type-def type-id='type-id-2983' size-in-bits='64' id='type-id-2985'/>
     <qualified-type-def type-id='type-id-2986' const='yes' id='type-id-2987'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2987' size-in-bits='64' id='type-id-2988'/>
+    <pointer-type-def type-id='type-id-2987' size-in-bits='64' id='type-id-2988'/>
     <qualified-type-def type-id='type-id-2989' const='yes' id='type-id-2990'/>
     <reference-type-def kind='lvalue' type-id='type-id-2990' size-in-bits='64' id='type-id-2991'/>
     <qualified-type-def type-id='type-id-2992' const='yes' id='type-id-2993'/>
     <reference-type-def kind='lvalue' type-id='type-id-2993' size-in-bits='64' id='type-id-2994'/>
-    <qualified-type-def type-id='type-id-2995' const='yes' id='type-id-2996'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2996' size-in-bits='64' id='type-id-2997'/>
-    <pointer-type-def type-id='type-id-2957' size-in-bits='64' id='type-id-2998'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2960' size-in-bits='64' id='type-id-2999'/>
-    <pointer-type-def type-id='type-id-2966' size-in-bits='64' id='type-id-3000'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2969' size-in-bits='64' id='type-id-3001'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2972' size-in-bits='64' id='type-id-3002'/>
-    <pointer-type-def type-id='type-id-2972' size-in-bits='64' id='type-id-3003'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3004' size-in-bits='64' id='type-id-3005'/>
-    <pointer-type-def type-id='type-id-3004' size-in-bits='64' id='type-id-3006'/>
-    <pointer-type-def type-id='type-id-3007' size-in-bits='64' id='type-id-3008'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2976' size-in-bits='64' id='type-id-3009'/>
+    <pointer-type-def type-id='type-id-2993' size-in-bits='64' id='type-id-2995'/>
+    <qualified-type-def type-id='type-id-2996' const='yes' id='type-id-2997'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2997' size-in-bits='64' id='type-id-2998'/>
+    <qualified-type-def type-id='type-id-2999' const='yes' id='type-id-3000'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3000' size-in-bits='64' id='type-id-3001'/>
+    <qualified-type-def type-id='type-id-3002' const='yes' id='type-id-3003'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3003' size-in-bits='64' id='type-id-3004'/>
+    <qualified-type-def type-id='type-id-3005' const='yes' id='type-id-3006'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3006' size-in-bits='64' id='type-id-3007'/>
+    <pointer-type-def type-id='type-id-2967' size-in-bits='64' id='type-id-3008'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2970' size-in-bits='64' id='type-id-3009'/>
     <pointer-type-def type-id='type-id-2976' size-in-bits='64' id='type-id-3010'/>
-    <pointer-type-def type-id='type-id-3011' size-in-bits='64' id='type-id-3012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2979' size-in-bits='64' id='type-id-3013'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2982' size-in-bits='64' id='type-id-3014'/>
-    <pointer-type-def type-id='type-id-2982' size-in-bits='64' id='type-id-3015'/>
-    <pointer-type-def type-id='type-id-3016' size-in-bits='64' id='type-id-3017'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2989' size-in-bits='64' id='type-id-3018'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2992' size-in-bits='64' id='type-id-3019'/>
-    <pointer-type-def type-id='type-id-2992' size-in-bits='64' id='type-id-3020'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2995' size-in-bits='64' id='type-id-3021'/>
-    <pointer-type-def type-id='type-id-2995' size-in-bits='64' id='type-id-3022'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3023' size-in-bits='64' id='type-id-3024'/>
-    <pointer-type-def type-id='type-id-3025' size-in-bits='64' id='type-id-2907'/>
-    <pointer-type-def type-id='type-id-3026' size-in-bits='64' id='type-id-2917'/>
-    <pointer-type-def type-id='type-id-3027' size-in-bits='64' id='type-id-2916'/>
-    <pointer-type-def type-id='type-id-3028' size-in-bits='64' id='type-id-2913'/>
-    <pointer-type-def type-id='type-id-3029' size-in-bits='64' id='type-id-2912'/>
-    <pointer-type-def type-id='type-id-3030' size-in-bits='64' id='type-id-2908'/>
-    <pointer-type-def type-id='type-id-3031' size-in-bits='64' id='type-id-2909'/>
-    <pointer-type-def type-id='type-id-3032' size-in-bits='64' id='type-id-2903'/>
-    <pointer-type-def type-id='type-id-3033' size-in-bits='64' id='type-id-2910'/>
-    <pointer-type-def type-id='type-id-3034' size-in-bits='64' id='type-id-2911'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2979' size-in-bits='64' id='type-id-3011'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2982' size-in-bits='64' id='type-id-3012'/>
+    <pointer-type-def type-id='type-id-2982' size-in-bits='64' id='type-id-3013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3014' size-in-bits='64' id='type-id-3015'/>
+    <pointer-type-def type-id='type-id-3014' size-in-bits='64' id='type-id-3016'/>
+    <pointer-type-def type-id='type-id-3017' size-in-bits='64' id='type-id-3018'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2986' size-in-bits='64' id='type-id-3019'/>
+    <pointer-type-def type-id='type-id-2986' size-in-bits='64' id='type-id-3020'/>
+    <pointer-type-def type-id='type-id-3021' size-in-bits='64' id='type-id-3022'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2989' size-in-bits='64' id='type-id-3023'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2992' size-in-bits='64' id='type-id-3024'/>
+    <pointer-type-def type-id='type-id-2992' size-in-bits='64' id='type-id-3025'/>
+    <pointer-type-def type-id='type-id-3026' size-in-bits='64' id='type-id-3027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2999' size-in-bits='64' id='type-id-3028'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3002' size-in-bits='64' id='type-id-3029'/>
+    <pointer-type-def type-id='type-id-3002' size-in-bits='64' id='type-id-3030'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3005' size-in-bits='64' id='type-id-3031'/>
+    <pointer-type-def type-id='type-id-3005' size-in-bits='64' id='type-id-3032'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3033' size-in-bits='64' id='type-id-3034'/>
     <pointer-type-def type-id='type-id-3035' size-in-bits='64' id='type-id-2905'/>
     <pointer-type-def type-id='type-id-3036' size-in-bits='64' id='type-id-3037'/>
     <pointer-type-def type-id='type-id-3038' size-in-bits='64' id='type-id-2914'/>
@@ -19231,183 +19231,183 @@
     <pointer-type-def type-id='type-id-3040' size-in-bits='64' id='type-id-2904'/>
     <pointer-type-def type-id='type-id-3041' size-in-bits='64' id='type-id-2906'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2992'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2939'/>
+      <class-decl name='allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3002'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2949'/>
         <member-type access='private'>
           <class-decl name='rebind&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' id='type-id-3042'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-2995' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-3043'/>
+              <typedef-decl name='other' type-id='type-id-3005' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='107' column='1' id='type-id-3043'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2989'/>
+          <typedef-decl name='value_type' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-2999'/>
         </member-type>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-2995'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2941'/>
+      <class-decl name='allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3005'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2951'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-2972' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3044'/>
+          <typedef-decl name='value_type' type-id='type-id-2982' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='103' column='1' id='type-id-3044'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3022' is-artificial='yes'/>
+            <parameter type-id='type-id-3032' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeI8MyoTableEEC2Ev'>
-            <parameter type-id='type-id-3022' is-artificial='yes'/>
+            <parameter type-id='type-id-3032' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3022' is-artificial='yes'/>
+            <parameter type-id='type-id-3032' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeI8MyoTableEED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeI8MyoTableEED2Ev'>
-            <parameter type-id='type-id-3022' is-artificial='yes'/>
+            <parameter type-id='type-id-3032' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_const_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-2957'>
+      <class-decl name='_List_const_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='207' column='1' id='type-id-2967'>
         <member-type access='public'>
-          <typedef-decl name='_Node' type-id='type-id-2973' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-3045'/>
+          <typedef-decl name='_Node' type-id='type-id-2983' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='210' column='1' id='type-id-3045'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-2957' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-2960'/>
+          <typedef-decl name='_Self' type-id='type-id-2967' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='209' column='1' id='type-id-2970'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2945' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-3046'/>
+          <typedef-decl name='pointer' type-id='type-id-2955' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='216' column='1' id='type-id-3046'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-2944' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-3047'/>
+          <typedef-decl name='reference' type-id='type-id-2954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='217' column='1' id='type-id-3047'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-722' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='282' column='1'/>
         </data-member>
         <member-function access='public' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt20_List_const_iteratorI8MyoTableEptEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorI8MyoTableEptEv'>
-            <parameter type-id='type-id-2959' is-artificial='yes'/>
+            <parameter type-id='type-id-2969' is-artificial='yes'/>
             <return type-id='type-id-3046'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEppEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorI8MyoTableEppEv'>
-            <parameter type-id='type-id-2998' is-artificial='yes'/>
-            <return type-id='type-id-2999'/>
+            <parameter type-id='type-id-3008' is-artificial='yes'/>
+            <return type-id='type-id-3009'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt20_List_const_iteratorI8MyoTableEneERKS1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorI8MyoTableEneERKS1_'>
-            <parameter type-id='type-id-2959' is-artificial='yes'/>
-            <parameter type-id='type-id-2962'/>
+            <parameter type-id='type-id-2969' is-artificial='yes'/>
+            <parameter type-id='type-id-2972'/>
             <return type-id='type-id-149'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEC4ERKSt14_List_iteratorIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2998' is-artificial='yes'/>
-            <parameter type-id='type-id-2965'/>
+            <parameter type-id='type-id-3008' is-artificial='yes'/>
+            <parameter type-id='type-id-2975'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorI8MyoTableEC2ERKSt14_List_iteratorIS0_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorI8MyoTableEC2ERKSt14_List_iteratorIS0_E'>
-            <parameter type-id='type-id-2998' is-artificial='yes'/>
-            <parameter type-id='type-id-2965'/>
+            <parameter type-id='type-id-3008' is-artificial='yes'/>
+            <parameter type-id='type-id-2975'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2966'>
+      <class-decl name='_List_iterator&lt;MyoTable&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='128' column='1' id='type-id-2976'>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-2966' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2969'/>
+          <typedef-decl name='_Self' type-id='type-id-2976' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='130' column='1' id='type-id-2979'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_node' type-id='type-id-953' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='198' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorI8MyoTableEC4EPNSt8__detail15_List_node_baseE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3000' is-artificial='yes'/>
+            <parameter type-id='type-id-3010' is-artificial='yes'/>
             <parameter type-id='type-id-953'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorI8MyoTableEC2EPNSt8__detail15_List_node_baseE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorI8MyoTableEC2EPNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-3000' is-artificial='yes'/>
+            <parameter type-id='type-id-3010' is-artificial='yes'/>
             <parameter type-id='type-id-953'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;MyoTable&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='109' column='1' id='type-id-2972'>
+      <class-decl name='_List_node&lt;MyoTable&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='109' column='1' id='type-id-2982'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-720'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_storage' type-id='type-id-2935' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='112' column='1'/>
+          <var-decl name='_M_storage' type-id='type-id-2945' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='112' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_valptr' mangled-name='_ZNSt10_List_nodeI8MyoTableE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_nodeI8MyoTableE9_M_valptrEv'>
-            <parameter type-id='type-id-3003' is-artificial='yes'/>
+            <parameter type-id='type-id-3013' is-artificial='yes'/>
             <return type-id='type-id-2928'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_valptr' mangled-name='_ZNKSt10_List_nodeI8MyoTableE9_M_valptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10_List_nodeI8MyoTableE9_M_valptrEv'>
-            <parameter type-id='type-id-2975' is-artificial='yes'/>
-            <return type-id='type-id-2945'/>
+            <parameter type-id='type-id-2985' is-artificial='yes'/>
+            <return type-id='type-id-2955'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-3004'>
+      <class-decl name='__allocated_ptr&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='46' column='1' id='type-id-3014'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3048' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-3007'/>
+          <typedef-decl name='value_type' type-id='type-id-3048' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='49' column='1' id='type-id-3017'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_alloc' type-id='type-id-3022' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='94' column='1'/>
+          <var-decl name='_M_alloc' type-id='type-id-3032' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='94' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_ptr' type-id='type-id-3049' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='95' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEaSEDn' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEaSEDn'>
-            <parameter type-id='type-id-3006' is-artificial='yes'/>
-            <return type-id='type-id-3005'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
+            <return type-id='type-id-3015'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3006' is-artificial='yes'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEED2Ev'>
-            <parameter type-id='type-id-3006' is-artificial='yes'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC4ERS3_PS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3006' is-artificial='yes'/>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-3049'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__allocated_ptr' mangled-name='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC2ERS3_PS2_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/allocated_ptr.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15__allocated_ptrISaISt10_List_nodeI8MyoTableEEEC2ERS3_PS2_'>
-            <parameter type-id='type-id-3006' is-artificial='yes'/>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-3049'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -19451,7 +19451,7 @@
           <typedef-decl name='rebind_alloc' type-id='type-id-3069' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='181' column='1' id='type-id-3068'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2989' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3070'/>
+          <typedef-decl name='value_type' type-id='type-id-2999' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='86' column='1' id='type-id-3070'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='const_void_pointer' type-id='type-id-3072' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='122' column='1' id='type-id-3071'/>
@@ -19470,30 +19470,30 @@
         </member-type>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;MyoTable, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE12_S_constructIS1_JS1_EEENSt9enable_ifIXsrSt6__and_IJNS4_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS3_PS9_DpOSA_'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-2928'/>
-            <parameter type-id='type-id-2933'/>
+            <parameter type-id='type-id-2942'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE8allocateERS3_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE8allocateERS3_m'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-1487'/>
             <return type-id='type-id-3074'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;MyoTable, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE9constructIS1_JS1_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS3_PT_DpOS6_'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-2928'/>
-            <parameter type-id='type-id-2933'/>
+            <parameter type-id='type-id-2942'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10deallocateERS3_PS2_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10deallocateERS3_PS2_m'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-3074'/>
             <parameter type-id='type-id-1487'/>
             <return type-id='type-id-154'/>
@@ -19501,7 +19501,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;, MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE10_S_destroyIS3_S1_EEDTcldtfp_7destroyfp0_EERT_PT0_i'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-2928'/>
             <parameter type-id='type-id-30'/>
             <return type-id='type-id-154'/>
@@ -19509,7 +19509,7 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;MyoTable&gt;' mangled-name='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE7destroyIS1_EEvRS3_PT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt10_List_nodeI8MyoTableEEE7destroyIS1_EEvRS3_PT_'>
-            <parameter type-id='type-id-3021'/>
+            <parameter type-id='type-id-3031'/>
             <parameter type-id='type-id-2928'/>
             <return type-id='type-id-154'/>
           </function-decl>
@@ -19519,7 +19519,7 @@
       </class-decl>
       <class-decl name='remove_reference&lt;MyoTable&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1581' column='1' id='type-id-3079'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-3023'/>
+          <typedef-decl name='type' type-id='type-id-2926' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='1582' column='1' id='type-id-3033'/>
         </member-type>
       </class-decl>
       <typedef-decl name='__alloc_rebind' type-id='type-id-3080' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='74' column='1' id='type-id-3069'/>
@@ -19536,136 +19536,136 @@
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3086'/>
       <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt;, std::_Rb_tree_iterator&lt;std::pair&lt;long unsigned int const, Stream*&gt; &gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3087'/>
       <function-decl name='__addressof&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' mangled-name='_ZSt11__addressofISaISt10_List_nodeI8MyoTableEEEPT_RS4_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofISaISt10_List_nodeI8MyoTableEEEPT_RS4_'>
-        <parameter type-id='type-id-3021' name='__r' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-3022'/>
+        <parameter type-id='type-id-3031' name='__r' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-3032'/>
       </function-decl>
       <function-decl name='forward&lt;MyoTable&gt;' mangled-name='_ZSt7forwardI8MyoTableEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardI8MyoTableEOT_RNSt16remove_referenceIS1_E4typeE'>
-        <parameter type-id='type-id-3024' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2933'/>
+        <parameter type-id='type-id-3034' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2942'/>
       </function-decl>
       <function-decl name='move&lt;MyoTable&amp;&gt;' mangled-name='_ZSt4moveIR8MyoTableEONSt16remove_referenceIT_E4typeEOS3_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIR8MyoTableEONSt16remove_referenceIT_E4typeEOS3_'>
-        <parameter type-id='type-id-2933' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3024'/>
+        <parameter type-id='type-id-2942' name='__t' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3034'/>
       </function-decl>
       <typedef-decl name='__detected_or_t' type-id='type-id-3062' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-3072'/>
       <typedef-decl name='__detected_or_t' type-id='type-id-3064' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-3077'/>
       <typedef-decl name='__detected_or_t' type-id='type-id-1387' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/type_traits' line='2447' column='1' id='type-id-1536'/>
       <namespace-decl name='__cxx11'>
-        <class-decl name='_List_base&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2976'>
+        <class-decl name='_List_base&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='300' column='1' id='type-id-2986'>
           <member-type access='protected'>
-            <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-3011'>
-              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2995'/>
+            <class-decl name='_List_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='323' column='1' id='type-id-3021'>
+              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3005'/>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='_M_node' type-id='type-id-504' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='327' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='_List_impl' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-3012' is-artificial='yes'/>
+                  <parameter type-id='type-id-3022' is-artificial='yes'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='_List_impl' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE10_List_implC2Ev'>
-                  <parameter type-id='type-id-3012' is-artificial='yes'/>
+                  <parameter type-id='type-id-3022' is-artificial='yes'/>
                   <return type-id='type-id-154'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='protected'>
-            <typedef-decl name='_Node_alloc_type' type-id='type-id-3088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2979'/>
+            <typedef-decl name='_Node_alloc_type' type-id='type-id-3088' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='307' column='1' id='type-id-2989'/>
           </member-type>
           <data-member access='protected' layout-offset-in-bits='0'>
-            <var-decl name='_M_impl' type-id='type-id-3011' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='347' column='1'/>
+            <var-decl name='_M_impl' type-id='type-id-3021' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='347' column='1'/>
           </data-member>
           <member-function access='protected'>
             <function-decl name='_M_get_node' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_get_nodeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_get_nodeEv'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <return type-id='type-id-3049'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_inc_size' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_inc_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_inc_sizeEm'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_set_size' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_set_sizeEm' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_set_sizeEm'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <parameter type-id='type-id-278'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_put_node' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE11_M_put_nodeEPSt10_List_nodeIS1_E'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <parameter type-id='type-id-3049'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE21_M_get_Node_allocatorEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE21_M_get_Node_allocatorEv'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
-              <return type-id='type-id-3013'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
+              <return type-id='type-id-3023'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_init' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE7_M_initEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE7_M_initEv'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_M_clear' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE8_M_clearEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/list.tcc' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EE8_M_clearEv'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private' destructor='yes'>
             <function-decl name='~_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <parameter type-id='type-id-30' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private' destructor='yes'>
             <function-decl name='~_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EED2Ev'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <parameter type-id='type-id-30' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_List_base' mangled-name='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx1110_List_baseI8MyoTableSaIS1_EEC2Ev'>
-              <parameter type-id='type-id-3010' is-artificial='yes'/>
+              <parameter type-id='type-id-3020' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='list&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2982'>
-          <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2976'/>
+        <class-decl name='list&lt;MyoTable, std::allocator&lt;MyoTable&gt; &gt;' size-in-bits='192' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='503' column='1' id='type-id-2992'>
+          <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-2986'/>
           <member-type access='protected'>
-            <typedef-decl name='_Node' type-id='type-id-2972' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-3016'/>
+            <typedef-decl name='_Node' type-id='type-id-2982' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='533' column='1' id='type-id-3026'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='allocator_type' type-id='type-id-2992' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2986'/>
+            <typedef-decl name='allocator_type' type-id='type-id-3002' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='528' column='1' id='type-id-2996'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='const_iterator' type-id='type-id-2957' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-3089'/>
+            <typedef-decl name='const_iterator' type-id='type-id-2967' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='523' column='1' id='type-id-3089'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='const_reference' type-id='type-id-3091' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='521' column='1' id='type-id-3090'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='iterator' type-id='type-id-2966' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2963'/>
+            <typedef-decl name='iterator' type-id='type-id-2976' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='522' column='1' id='type-id-2973'/>
           </member-type>
           <member-type access='private'>
             <typedef-decl name='reference' type-id='type-id-3093' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='520' column='1' id='type-id-3092'/>
@@ -19678,53 +19678,53 @@
           </member-type>
           <member-function access='protected'>
             <function-decl name='_M_create_node&lt;MyoTable&gt;' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE14_M_create_nodeIJS1_EEEPSt10_List_nodeIS1_EDpOT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE14_M_create_nodeIJS1_EEEPSt10_List_nodeIS1_EDpOT_'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
-              <parameter type-id='type-id-2933'/>
-              <return type-id='type-id-3017'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
+              <parameter type-id='type-id-2942'/>
+              <return type-id='type-id-3027'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='_M_insert&lt;MyoTable&gt;' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9_M_insertIJS1_EEEvSt14_List_iteratorIS1_EDpOT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9_M_insertIJS1_EEEvSt14_List_iteratorIS1_EDpOT_'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
-              <parameter type-id='type-id-2963'/>
-              <parameter type-id='type-id-2933'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
+              <parameter type-id='type-id-2973'/>
+              <parameter type-id='type-id-2942'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='push_back' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9push_backEOS1_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE9push_backEOS1_'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
-              <parameter type-id='type-id-3018'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
+              <parameter type-id='type-id-3028'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='clear' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5clearEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5clearEv'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='end' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE3endEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE3endEv'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
-              <return type-id='type-id-2963'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
+              <return type-id='type-id-2973'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='begin' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5beginEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='840' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EE5beginEv'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
-              <return type-id='type-id-2963'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
+              <return type-id='type-id-2973'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='list' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='list' mangled-name='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/bits/stl_list.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7__cxx114listI8MyoTableSaIS1_EEC2Ev'>
-              <parameter type-id='type-id-3015' is-artificial='yes'/>
+              <parameter type-id='type-id-3025' is-artificial='yes'/>
               <return type-id='type-id-154'/>
             </function-decl>
           </member-function>
@@ -19819,50 +19819,50 @@
       <return type-id='type-id-154'/>
     </function-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2939'>
+      <class-decl name='new_allocator&lt;MyoTable&gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2949'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-2945' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3099'/>
+          <typedef-decl name='const_pointer' type-id='type-id-2955' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3099'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2944' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3100'/>
+          <typedef-decl name='const_reference' type-id='type-id-2954' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3100'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-2928' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3101'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2933' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3102'/>
+          <typedef-decl name='reference' type-id='type-id-2942' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3102'/>
         </member-type>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2941'>
+      <class-decl name='new_allocator&lt;std::_List_node&lt;MyoTable&gt; &gt;' size-in-bits='8' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='58' column='1' id='type-id-2951'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-2975' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3103'/>
+          <typedef-decl name='const_pointer' type-id='type-id-2985' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='64' column='1' id='type-id-3103'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2974' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3104'/>
+          <typedef-decl name='const_reference' type-id='type-id-2984' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='66' column='1' id='type-id-3104'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3003' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3105'/>
+          <typedef-decl name='pointer' type-id='type-id-3013' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='63' column='1' id='type-id-3105'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3002' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3106'/>
+          <typedef-decl name='reference' type-id='type-id-3012' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='65' column='1' id='type-id-3106'/>
         </member-type>
         <member-function access='private' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE8max_sizeEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE8max_sizeEv'>
-            <parameter type-id='type-id-2956' is-artificial='yes'/>
+            <parameter type-id='type-id-2966' is-artificial='yes'/>
             <return type-id='type-id-950'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct&lt;MyoTable, MyoTable&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE9constructIS2_JS2_EEEvPT_DpOT0_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE9constructIS2_JS2_EEEvPT_DpOT0_'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-2928'/>
-            <parameter type-id='type-id-2933'/>
+            <parameter type-id='type-id-2942'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE8allocateEmPKv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE8allocateEmPKv'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-950'/>
             <parameter type-id='type-id-150'/>
             <return type-id='type-id-3105'/>
@@ -19870,7 +19870,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE10deallocateEPS3_m' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE10deallocateEPS3_m'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-3105'/>
             <parameter type-id='type-id-950'/>
             <return type-id='type-id-154'/>
@@ -19878,64 +19878,64 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy&lt;MyoTable&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE7destroyIS2_EEvPT_' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEE7destroyIS2_EEvPT_'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-2928'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEEC4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEEC2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEEC2Ev'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEED4Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEED2Ev' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeI8MyoTableEED2Ev'>
-            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2952' is-artificial='yes'/>
             <parameter type-id='type-id-30' is-artificial='yes'/>
             <return type-id='type-id-154'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__aligned_membuf&lt;MyoTable&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='47' column='1' id='type-id-2935'>
+      <class-decl name='__aligned_membuf&lt;MyoTable&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='47' column='1' id='type-id-2945'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_storage' type-id='type-id-294' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='54' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_addr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI8MyoTableE7_M_addrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx16__aligned_membufI8MyoTableE7_M_addrEv'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
             <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_membufI8MyoTableE6_M_ptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx16__aligned_membufI8MyoTableE6_M_ptrEv'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
             <return type-id='type-id-2928'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_addr' mangled-name='_ZNK9__gnu_cxx16__aligned_membufI8MyoTableE7_M_addrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx16__aligned_membufI8MyoTableE7_M_addrEv'>
-            <parameter type-id='type-id-2948' is-artificial='yes'/>
+            <parameter type-id='type-id-2958' is-artificial='yes'/>
             <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_ptr' mangled-name='_ZNK9__gnu_cxx16__aligned_membufI8MyoTableE6_M_ptrEv' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/aligned_buffer.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx16__aligned_membufI8MyoTableE6_M_ptrEv'>
-            <parameter type-id='type-id-2948' is-artificial='yes'/>
-            <return type-id='type-id-2945'/>
+            <parameter type-id='type-id-2958' is-artificial='yes'/>
+            <return type-id='type-id-2955'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -19949,13 +19949,13 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-2950' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-3091'/>
+          <typedef-decl name='const_reference' type-id='type-id-2960' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='65' column='1' id='type-id-3091'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-2938' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-3093'/>
+          <typedef-decl name='reference' type-id='type-id-2948' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='64' column='1' id='type-id-3093'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3070' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2937'/>
+          <typedef-decl name='value_type' type-id='type-id-3070' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='58' column='1' id='type-id-2947'/>
         </member-type>
       </class-decl>
       <class-decl name='__alloc_traits&lt;std::allocator&lt;std::_List_node&lt;MyoTable&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/export/users/iverbin/gcc_build_host/x86_64-pc-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='50' column='1' id='type-id-3109'>
@@ -19965,50 +19965,50 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-3025'>
-      <return type-id='type-id-2920'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-3028'>
+    <function-type size-in-bits='64' id='type-id-2934'>
       <parameter type-id='type-id-2921'/>
       <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-2922'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3026'>
+    <function-type size-in-bits='64' id='type-id-2936'>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3027'>
+    <function-type size-in-bits='64' id='type-id-2933'>
       <parameter type-id='type-id-2902'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3029'>
+    <function-type size-in-bits='64' id='type-id-2937'>
+      <return type-id='type-id-2920'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-2935'>
       <parameter type-id='type-id-2923'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3030'>
+    <function-type size-in-bits='64' id='type-id-2938'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3031'>
+    <function-type size-in-bits='64' id='type-id-2939'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-30'/>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3032'>
+    <function-type size-in-bits='64' id='type-id-2940'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3033'>
+    <function-type size-in-bits='64' id='type-id-2941'>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-30'/>
       <return type-id='type-id-2920'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3034'>
+    <function-type size-in-bits='64' id='type-id-2943'>
       <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-150'/>
       <parameter type-id='type-id-30'/>
@@ -20778,7 +20778,7 @@
     </class-decl>
     <class-decl name='MYOVarTable' size-in-bits='64' is-struct='yes' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='353' column='1' id='type-id-3157'>
       <member-type access='public'>
-        <typedef-decl name='Entry' type-id='type-id-2934' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='354' column='1' id='type-id-3178'/>
+        <typedef-decl name='Entry' type-id='type-id-2944' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='354' column='1' id='type-id-3178'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='entries' type-id='type-id-3179' visibility='default' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='355' column='1'/>
@@ -20878,7 +20878,7 @@
     <typedef-decl name='InitTableEntry' type-id='type-id-3172' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='296' column='1' id='type-id-2931'/>
     <typedef-decl name='MyoArena' type-id='type-id-35' filepath='../../../gcc/liboffloadmic/include/myo/myotypes.h' line='140' column='1' id='type-id-2902'/>
     <typedef-decl name='MyoiSharedVarEntry' type-id='type-id-3181' filepath='../../../gcc/liboffloadmic/include/myo/myoimpl.h' line='357' column='1' id='type-id-3180'/>
-    <typedef-decl name='SharedTableEntry' type-id='type-id-3180' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='270' column='1' id='type-id-2934'/>
+    <typedef-decl name='SharedTableEntry' type-id='type-id-3180' filepath='../../../gcc/liboffloadmic/runtime/offload_table.h' line='270' column='1' id='type-id-2944'/>
     <typedef-decl name='__pthread_list_t' type-id='type-id-3183' filepath='/usr/include/bits/pthreadtypes.h' line='79' column='1' id='type-id-3187'/>
     <typedef-decl name='intptr_t' type-id='type-id-165' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-3165'/>
     <typedef-decl name='pthread_mutex_t' type-id='type-id-3188' filepath='/usr/include/bits/pthreadtypes.h' line='127' column='1' id='type-id-3185'/>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 979622d5..c5c9654a 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1642,22 +1642,22 @@
     <qualified-type-def type-id='type-id-106' const='yes' id='type-id-148'/>
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-89'/>
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-134'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-133'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-128'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-91'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-152'/>
     <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-93'/>
     <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-153'/>
     <reference-type-def kind='lvalue' type-id='type-id-123' size-in-bits='64' id='type-id-96'/>
     <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-86'/>
     <reference-type-def kind='lvalue' type-id='type-id-124' size-in-bits='64' id='type-id-98'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-87'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-127'/>
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-118'/>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-84'/>
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-130'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-133'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-131'/>
     <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-121'>
@@ -1980,45 +1980,45 @@
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='hb_buffer_serialize_glyphs' mangled-name='hb_buffer_serialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_glyphs'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
       <parameter type-id='type-id-18' name='start' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='247' column='1'/>
       <parameter type-id='type-id-18' name='end' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='248' column='1'/>
       <parameter type-id='type-id-48' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='249' column='1'/>
       <parameter type-id='type-id-18' name='buf_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='250' column='1'/>
       <parameter type-id='type-id-60' name='buf_consumed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='251' column='1'/>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
       <parameter type-id='type-id-66' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='254' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='hb_buffer_deserialize_glyphs' mangled-name='hb_buffer_deserialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_deserialize_glyphs'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
       <parameter type-id='type-id-17' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='354' column='1'/>
       <parameter type-id='type-id-11' name='buf_len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='355' column='1'/>
       <parameter type-id='type-id-142' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
       <parameter type-id='type-id-67' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-150'>
+    <function-type size-in-bits='64' id='type-id-154'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-69'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-151'>
+    <function-type size-in-bits='64' id='type-id-155'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-70'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-152'>
+    <function-type size-in-bits='64' id='type-id-156'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-71'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-155'>
+    <function-type size-in-bits='64' id='type-id-150'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-119'/>
@@ -2026,7 +2026,7 @@
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-156'>
+    <function-type size-in-bits='64' id='type-id-151'>
       <parameter type-id='type-id-84'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-72'/>
@@ -2146,21 +2146,21 @@
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <function-decl name='hb_buffer_get_empty' mangled-name='hb_buffer_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_empty'>
-      <return type-id='type-id-153'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <function-decl name='hb_buffer_reference' mangled-name='hb_buffer_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reference'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
-      <return type-id='type-id-153'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
+      <return type-id='type-id-152'/>
     </function-decl>
     <function-decl name='hb_buffer_destroy' mangled-name='hb_buffer_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_destroy'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_set_user_data' mangled-name='hb_buffer_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_user_data'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='773' column='1'/>
       <parameter type-id='type-id-19' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='774' column='1'/>
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='775' column='1'/>
@@ -2168,139 +2168,139 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_buffer_get_user_data' mangled-name='hb_buffer_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_user_data'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='794' column='1'/>
       <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='hb_buffer_set_content_type' mangled-name='hb_buffer_set_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_content_type'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
       <parameter type-id='type-id-64' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_content_type' mangled-name='hb_buffer_get_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_content_type'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
       <return type-id='type-id-64'/>
     </function-decl>
     <function-decl name='hb_buffer_set_unicode_funcs' mangled-name='hb_buffer_set_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_unicode_funcs'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
       <parameter type-id='type-id-84' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_unicode_funcs' mangled-name='hb_buffer_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_unicode_funcs'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
       <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='hb_buffer_set_direction' mangled-name='hb_buffer_set_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_direction'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_direction' mangled-name='hb_buffer_get_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_direction'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
       <return type-id='type-id-68'/>
     </function-decl>
     <function-decl name='hb_buffer_set_script' mangled-name='hb_buffer_set_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_script'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
       <parameter type-id='type-id-69' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_script' mangled-name='hb_buffer_get_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_script'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
       <return type-id='type-id-69'/>
     </function-decl>
     <function-decl name='hb_buffer_set_language' mangled-name='hb_buffer_set_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_language'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
       <parameter type-id='type-id-105' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_language' mangled-name='hb_buffer_get_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_language'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
       <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <parameter type-id='type-id-173' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <parameter type-id='type-id-177' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
       <parameter type-id='type-id-65' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_flags' mangled-name='hb_buffer_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_flags'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
       <return type-id='type-id-65'/>
     </function-decl>
     <function-decl name='hb_buffer_set_replacement_codepoint' mangled-name='hb_buffer_set_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_replacement_codepoint'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
       <parameter type-id='type-id-72' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_get_replacement_codepoint' mangled-name='hb_buffer_get_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_replacement_codepoint'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
       <return type-id='type-id-72'/>
     </function-decl>
     <function-decl name='hb_buffer_reset' mangled-name='hb_buffer_reset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reset'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_clear_contents' mangled-name='hb_buffer_clear_contents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_clear_contents'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_pre_allocate' mangled-name='hb_buffer_pre_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_pre_allocate'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <parameter type-id='type-id-18' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_buffer_allocation_successful' mangled-name='hb_buffer_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_allocation_successful'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_buffer_add' mangled-name='hb_buffer_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
       <parameter type-id='type-id-72' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
       <parameter type-id='type-id-18' name='cluster' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1162' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_set_length' mangled-name='hb_buffer_set_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_length'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1'/>
       <parameter type-id='type-id-18' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1181' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='hb_buffer_get_glyph_infos' mangled-name='hb_buffer_get_glyph_infos' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_infos'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1238' column='1'/>
       <return type-id='type-id-86'/>
     </function-decl>
     <function-decl name='hb_buffer_get_glyph_positions' mangled-name='hb_buffer_get_glyph_positions' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_positions'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1260' column='1'/>
       <return type-id='type-id-87'/>
     </function-decl>
     <function-decl name='hb_buffer_reverse' mangled-name='hb_buffer_reverse' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_reverse_clusters' mangled-name='hb_buffer_reverse_clusters' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse_clusters'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_guess_segment_properties' mangled-name='hb_buffer_guess_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_guess_segment_properties'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf8' mangled-name='hb_buffer_add_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf8'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
       <parameter type-id='type-id-17' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1414' column='1'/>
       <parameter type-id='type-id-11' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1415' column='1'/>
       <parameter type-id='type-id-18' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1416' column='1'/>
@@ -2308,7 +2308,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <parameter type-id='type-id-167' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <parameter type-id='type-id-11' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1437' column='1'/>
       <parameter type-id='type-id-18' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1438' column='1'/>
@@ -2316,7 +2316,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <parameter type-id='type-id-171' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <parameter type-id='type-id-11' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1459' column='1'/>
       <parameter type-id='type-id-18' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1460' column='1'/>
@@ -2324,7 +2324,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_add_codepoints' mangled-name='hb_buffer_add_codepoints' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_codepoints'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
       <parameter type-id='type-id-95' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
       <parameter type-id='type-id-11' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1481' column='1'/>
       <parameter type-id='type-id-18' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1482' column='1'/>
@@ -2332,7 +2332,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_buffer_normalize_glyphs' mangled-name='hb_buffer_normalize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_normalize_glyphs'>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
   </abi-instr>
@@ -3203,23 +3203,23 @@
     <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-226'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-160'/>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-217'/>
     <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-161'/>
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-159'/>
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-216'/>
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-194'/>
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-231'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-226'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-370'/>
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
       <parameter type-id='type-id-196' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
@@ -5678,7 +5678,7 @@
       <return type-id='type-id-59'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-361'>
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-17'/>
       <parameter type-id='type-id-11'/>
@@ -5687,7 +5687,7 @@
       <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-362'>
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-48'/>
@@ -5695,16 +5695,16 @@
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-363'>
-      <parameter type-id='type-id-154'/>
+    <function-type size-in-bits='64' id='type-id-364'>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-364'>
-      <parameter type-id='type-id-154'/>
+    <function-type size-in-bits='64' id='type-id-365'>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-163'/>
@@ -5712,8 +5712,8 @@
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-365'>
-      <parameter type-id='type-id-154'/>
+    <function-type size-in-bits='64' id='type-id-363'>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-72'/>
@@ -5722,7 +5722,7 @@
       <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-366'>
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-18'/>
@@ -5732,7 +5732,7 @@
       <return type-id='type-id-40'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-367'>
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-72'/>
@@ -5740,7 +5740,7 @@
       <return type-id='type-id-103'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-368'>
-      <parameter type-id='type-id-154'/>
+      <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-19'/>
       <parameter type-id='type-id-72'/>
       <parameter type-id='type-id-19'/>
@@ -5748,8 +5748,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-234'>
       <parameter type-id='type-id-194'/>
-      <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-350'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-40'/>
@@ -5872,56 +5872,56 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph' mangled-name='hb_font_get_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
       <parameter type-id='type-id-72' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <parameter type-id='type-id-72' name='variation_selector' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <parameter type-id='type-id-119' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='433' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_advance' mangled-name='hb_font_get_glyph_h_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_advance'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
       <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_advance' mangled-name='hb_font_get_glyph_v_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_advance'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='469' column='1'/>
       <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='510' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
       <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='511' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
       <parameter type-id='type-id-72' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <parameter type-id='type-id-72' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_kerning' mangled-name='hb_font_get_glyph_v_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_kerning'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1'/>
       <parameter type-id='type-id-72' name='top_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='549' column='1'/>
       <parameter type-id='type-id-72' name='bottom_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='549' column='1'/>
       <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
       <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <parameter type-id='type-id-18' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
@@ -5929,21 +5929,21 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
       <parameter type-id='type-id-48' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='612' column='1'/>
       <parameter type-id='type-id-18' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='612' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_from_name' mangled-name='hb_font_get_glyph_from_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_from_name'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <parameter type-id='type-id-17' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <parameter type-id='type-id-11' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <parameter type-id='type-id-119' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_advance_for_direction' mangled-name='hb_font_get_glyph_advance_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_advance_for_direction'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
@@ -5951,7 +5951,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='676' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='677' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='678' column='1'/>
@@ -5959,7 +5959,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='697' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='698' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='699' column='1'/>
@@ -5967,7 +5967,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='718' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='719' column='1'/>
       <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='720' column='1'/>
@@ -5975,7 +5975,7 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
       <parameter type-id='type-id-72' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <parameter type-id='type-id-72' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
@@ -5984,14 +5984,14 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
       <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <parameter type-id='type-id-18' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
@@ -6000,14 +6000,14 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
       <parameter type-id='type-id-48' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='808' column='1'/>
       <parameter type-id='type-id-18' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='808' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_glyph_from_string' mangled-name='hb_font_glyph_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_from_string'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1'/>
       <parameter type-id='type-id-17' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='829' column='1'/>
       <parameter type-id='type-id-11' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='829' column='1'/>
       <parameter type-id='type-id-119' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='830' column='1'/>
@@ -6015,25 +6015,25 @@
     </function-decl>
     <function-decl name='hb_font_create' mangled-name='hb_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create'>
       <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
-      <parameter type-id='type-id-154' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
-      <return type-id='type-id-154'/>
+      <parameter type-id='type-id-153' name='parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_font_get_empty' mangled-name='hb_font_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_empty'>
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_font_reference' mangled-name='hb_font_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_reference'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
-      <return type-id='type-id-154'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_font_destroy' mangled-name='hb_font_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_destroy'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_set_user_data' mangled-name='hb_font_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_user_data'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1000' column='1'/>
       <parameter type-id='type-id-19' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1001' column='1'/>
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1002' column='1'/>
@@ -6041,59 +6041,59 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_user_data' mangled-name='hb_font_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_user_data'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
       <parameter type-id='type-id-26' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1021' column='1'/>
       <return type-id='type-id-19'/>
     </function-decl>
     <function-decl name='hb_font_make_immutable' mangled-name='hb_font_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_make_immutable'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_is_immutable' mangled-name='hb_font_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_is_immutable'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_font_get_parent' mangled-name='hb_font_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_parent'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
-      <return type-id='type-id-154'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
       <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
       <parameter type-id='type-id-161' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <parameter type-id='type-id-19' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1106' column='1'/>
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1107' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_set_funcs_data' mangled-name='hb_font_set_funcs_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs_data'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
       <parameter type-id='type-id-19' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1140' column='1'/>
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1141' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_set_scale' mangled-name='hb_font_set_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_scale'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
       <parameter type-id='type-id-11' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1170' column='1'/>
       <parameter type-id='type-id-11' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1171' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <parameter type-id='type-id-575' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <parameter type-id='type-id-575' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
       <parameter type-id='type-id-18' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1211' column='1'/>
       <parameter type-id='type-id-18' name='y_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1212' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_font_get_ppem' mangled-name='hb_font_get_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_ppem'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
       <parameter type-id='type-id-60' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1233' column='1'/>
       <parameter type-id='type-id-60' name='y_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1234' column='1'/>
       <return type-id='type-id-25'/>
@@ -6620,14 +6620,14 @@
     <function-decl name='hb_ft_font_create' mangled-name='hb_ft_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_create'>
       <parameter type-id='type-id-585' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
       <parameter type-id='type-id-20' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
-      <return type-id='type-id-154'/>
+      <return type-id='type-id-153'/>
     </function-decl>
     <function-decl name='hb_ft_font_set_funcs' mangled-name='hb_ft_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_set_funcs'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <return type-id='type-id-585'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-652'>
@@ -8197,7 +8197,7 @@
       <class-decl name='Supplier&lt;OT::VariationSelectorRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-824'/>
     </namespace-decl>
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
   </abi-instr>
@@ -8577,8 +8577,8 @@
           <parameter type-id='type-id-960' is-artificial='yes'/>
           <parameter type-id='type-id-961'/>
           <parameter type-id='type-id-962'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -8587,8 +8587,8 @@
           <parameter type-id='type-id-960' is-artificial='yes'/>
           <parameter type-id='type-id-963'/>
           <parameter type-id='type-id-962'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -8596,8 +8596,8 @@
         <function-decl name='position' mangled-name='_ZNK11hb_ot_map_t8positionEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-960' is-artificial='yes'/>
           <parameter type-id='type-id-962'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -8605,8 +8605,8 @@
         <function-decl name='substitute' mangled-name='_ZNK11hb_ot_map_t10substituteEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-960' is-artificial='yes'/>
           <parameter type-id='type-id-962'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -9333,511 +9333,514 @@
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
     <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1343'/>
-    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-963'/>
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1345' size-in-bits='64' id='type-id-961'/>
-    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1346'/>
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1348'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1348' size-in-bits='64' id='type-id-1349'/>
-    <pointer-type-def type-id='type-id-1348' size-in-bits='64' id='type-id-1350'/>
-    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1351'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-1352'/>
-    <pointer-type-def type-id='type-id-1351' size-in-bits='64' id='type-id-1353'/>
-    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1354'/>
-    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-517'/>
-    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1355'/>
-    <pointer-type-def type-id='type-id-1355' size-in-bits='64' id='type-id-518'/>
-    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1356'/>
-    <pointer-type-def type-id='type-id-1356' size-in-bits='64' id='type-id-519'/>
-    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1357'/>
+    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
+    <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
+    <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1349'/>
+    <qualified-type-def type-id='type-id-928' const='yes' id='type-id-1350'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1350' size-in-bits='64' id='type-id-963'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1351' size-in-bits='64' id='type-id-961'/>
+    <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1352'/>
+    <pointer-type-def type-id='type-id-1352' size-in-bits='64' id='type-id-1353'/>
+    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1354'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1354' size-in-bits='64' id='type-id-1355'/>
+    <pointer-type-def type-id='type-id-1354' size-in-bits='64' id='type-id-1356'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1357'/>
     <reference-type-def kind='lvalue' type-id='type-id-1357' size-in-bits='64' id='type-id-1358'/>
-    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-524'/>
-    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1359'/>
-    <pointer-type-def type-id='type-id-1359' size-in-bits='64' id='type-id-516'/>
-    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1360'/>
-    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1361'/>
-    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1362'/>
-    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-474'/>
-    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1363'/>
-    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-503'/>
-    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1364'/>
-    <pointer-type-def type-id='type-id-1364' size-in-bits='64' id='type-id-521'/>
-    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1365'/>
-    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-483'/>
-    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1366'/>
-    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-527'/>
-    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1367'/>
-    <pointer-type-def type-id='type-id-1367' size-in-bits='64' id='type-id-444'/>
-    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1368'/>
-    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-448'/>
-    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1369'/>
-    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-502'/>
-    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1370'/>
-    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-501'/>
-    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1371'/>
-    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-506'/>
-    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1372'/>
-    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-459'/>
-    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1373'/>
-    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-447'/>
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1374'/>
-    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-492'/>
-    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1375'/>
-    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-491'/>
-    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1376'/>
-    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-482'/>
-    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1377'/>
-    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-513'/>
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1378'/>
-    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-511'/>
-    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1379'/>
-    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-512'/>
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1380'/>
-    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-497'/>
-    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1381'/>
-    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-496'/>
-    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1382'/>
-    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-489'/>
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1383'/>
-    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-487'/>
-    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1384'/>
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-488'/>
-    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1385'/>
-    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-442'/>
-    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1386'/>
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-471'/>
-    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1387'/>
-    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-466'/>
-    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1388'/>
-    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-462'/>
-    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1389'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1389' size-in-bits='64' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-1391'/>
-    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1392'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1392' size-in-bits='64' id='type-id-1393'/>
-    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-1394'/>
-    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1395'/>
-    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-449'/>
-    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1396'/>
-    <pointer-type-def type-id='type-id-1396' size-in-bits='64' id='type-id-450'/>
-    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1397'/>
-    <pointer-type-def type-id='type-id-1397' size-in-bits='64' id='type-id-453'/>
-    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
-    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1400'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
-    <pointer-type-def type-id='type-id-1400' size-in-bits='64' id='type-id-1402'/>
-    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1403'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1403' size-in-bits='64' id='type-id-1404'/>
-    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-1405'/>
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1406'/>
+    <pointer-type-def type-id='type-id-1357' size-in-bits='64' id='type-id-1359'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1360'/>
+    <pointer-type-def type-id='type-id-1360' size-in-bits='64' id='type-id-517'/>
+    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1361'/>
+    <pointer-type-def type-id='type-id-1361' size-in-bits='64' id='type-id-518'/>
+    <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1362'/>
+    <pointer-type-def type-id='type-id-1362' size-in-bits='64' id='type-id-519'/>
+    <qualified-type-def type-id='type-id-1010' const='yes' id='type-id-1363'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1363' size-in-bits='64' id='type-id-1364'/>
+    <pointer-type-def type-id='type-id-1363' size-in-bits='64' id='type-id-524'/>
+    <qualified-type-def type-id='type-id-1013' const='yes' id='type-id-1365'/>
+    <pointer-type-def type-id='type-id-1365' size-in-bits='64' id='type-id-516'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1366'/>
+    <pointer-type-def type-id='type-id-1366' size-in-bits='64' id='type-id-463'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-1367'/>
+    <qualified-type-def type-id='type-id-1017' const='yes' id='type-id-1368'/>
+    <pointer-type-def type-id='type-id-1368' size-in-bits='64' id='type-id-474'/>
+    <qualified-type-def type-id='type-id-1019' const='yes' id='type-id-1369'/>
+    <pointer-type-def type-id='type-id-1369' size-in-bits='64' id='type-id-503'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1370'/>
+    <pointer-type-def type-id='type-id-1370' size-in-bits='64' id='type-id-521'/>
+    <qualified-type-def type-id='type-id-1023' const='yes' id='type-id-1371'/>
+    <pointer-type-def type-id='type-id-1371' size-in-bits='64' id='type-id-483'/>
+    <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1372'/>
+    <pointer-type-def type-id='type-id-1372' size-in-bits='64' id='type-id-527'/>
+    <qualified-type-def type-id='type-id-1026' const='yes' id='type-id-1373'/>
+    <pointer-type-def type-id='type-id-1373' size-in-bits='64' id='type-id-444'/>
+    <qualified-type-def type-id='type-id-1028' const='yes' id='type-id-1374'/>
+    <pointer-type-def type-id='type-id-1374' size-in-bits='64' id='type-id-448'/>
+    <qualified-type-def type-id='type-id-1030' const='yes' id='type-id-1375'/>
+    <pointer-type-def type-id='type-id-1375' size-in-bits='64' id='type-id-502'/>
+    <qualified-type-def type-id='type-id-1032' const='yes' id='type-id-1376'/>
+    <pointer-type-def type-id='type-id-1376' size-in-bits='64' id='type-id-501'/>
+    <qualified-type-def type-id='type-id-1034' const='yes' id='type-id-1377'/>
+    <pointer-type-def type-id='type-id-1377' size-in-bits='64' id='type-id-506'/>
+    <qualified-type-def type-id='type-id-1036' const='yes' id='type-id-1378'/>
+    <pointer-type-def type-id='type-id-1378' size-in-bits='64' id='type-id-459'/>
+    <qualified-type-def type-id='type-id-1038' const='yes' id='type-id-1379'/>
+    <pointer-type-def type-id='type-id-1379' size-in-bits='64' id='type-id-447'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1380'/>
+    <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-492'/>
+    <qualified-type-def type-id='type-id-1041' const='yes' id='type-id-1381'/>
+    <pointer-type-def type-id='type-id-1381' size-in-bits='64' id='type-id-491'/>
+    <qualified-type-def type-id='type-id-1042' const='yes' id='type-id-1382'/>
+    <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-482'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1383'/>
+    <pointer-type-def type-id='type-id-1383' size-in-bits='64' id='type-id-513'/>
+    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1384'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-511'/>
+    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1385'/>
+    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-512'/>
+    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1386'/>
+    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-497'/>
+    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1387'/>
+    <pointer-type-def type-id='type-id-1387' size-in-bits='64' id='type-id-496'/>
+    <qualified-type-def type-id='type-id-1054' const='yes' id='type-id-1388'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-489'/>
+    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-1389' size-in-bits='64' id='type-id-487'/>
+    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1390'/>
+    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-488'/>
+    <qualified-type-def type-id='type-id-1060' const='yes' id='type-id-1391'/>
+    <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-442'/>
+    <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1392'/>
+    <pointer-type-def type-id='type-id-1392' size-in-bits='64' id='type-id-471'/>
+    <qualified-type-def type-id='type-id-1064' const='yes' id='type-id-1393'/>
+    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-466'/>
+    <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-462'/>
+    <qualified-type-def type-id='type-id-1068' const='yes' id='type-id-1395'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1395' size-in-bits='64' id='type-id-1396'/>
+    <pointer-type-def type-id='type-id-1395' size-in-bits='64' id='type-id-1397'/>
+    <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1398'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1398' size-in-bits='64' id='type-id-1399'/>
+    <pointer-type-def type-id='type-id-1398' size-in-bits='64' id='type-id-1400'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1401'/>
+    <pointer-type-def type-id='type-id-1401' size-in-bits='64' id='type-id-449'/>
+    <qualified-type-def type-id='type-id-1076' const='yes' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-450'/>
+    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1403'/>
+    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-453'/>
+    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1404'/>
+    <pointer-type-def type-id='type-id-1404' size-in-bits='64' id='type-id-1405'/>
+    <qualified-type-def type-id='type-id-1088' const='yes' id='type-id-1406'/>
     <reference-type-def kind='lvalue' type-id='type-id-1406' size-in-bits='64' id='type-id-1407'/>
     <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
-    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1409'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1409'/>
     <reference-type-def kind='lvalue' type-id='type-id-1409' size-in-bits='64' id='type-id-1410'/>
     <pointer-type-def type-id='type-id-1409' size-in-bits='64' id='type-id-1411'/>
-    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1412'/>
+    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1412'/>
     <reference-type-def kind='lvalue' type-id='type-id-1412' size-in-bits='64' id='type-id-1413'/>
     <pointer-type-def type-id='type-id-1412' size-in-bits='64' id='type-id-1414'/>
-    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1415'/>
+    <qualified-type-def type-id='type-id-1094' const='yes' id='type-id-1415'/>
     <reference-type-def kind='lvalue' type-id='type-id-1415' size-in-bits='64' id='type-id-1416'/>
     <pointer-type-def type-id='type-id-1415' size-in-bits='64' id='type-id-1417'/>
-    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1418'/>
-    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-457'/>
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-1419' size-in-bits='64' id='type-id-1420'/>
-    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1421'/>
-    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
-    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1423' size-in-bits='64' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-1423' size-in-bits='64' id='type-id-1425'/>
-    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1426'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1426' size-in-bits='64' id='type-id-1427'/>
-    <pointer-type-def type-id='type-id-1426' size-in-bits='64' id='type-id-1428'/>
-    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1429'/>
+    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1418'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1418' size-in-bits='64' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-1418' size-in-bits='64' id='type-id-1420'/>
+    <qualified-type-def type-id='type-id-1100' const='yes' id='type-id-1421'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1421' size-in-bits='64' id='type-id-1422'/>
+    <pointer-type-def type-id='type-id-1421' size-in-bits='64' id='type-id-1423'/>
+    <qualified-type-def type-id='type-id-1103' const='yes' id='type-id-1424'/>
+    <pointer-type-def type-id='type-id-1424' size-in-bits='64' id='type-id-457'/>
+    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1425'/>
+    <pointer-type-def type-id='type-id-1425' size-in-bits='64' id='type-id-1426'/>
+    <qualified-type-def type-id='type-id-1107' const='yes' id='type-id-1427'/>
+    <pointer-type-def type-id='type-id-1427' size-in-bits='64' id='type-id-1428'/>
+    <qualified-type-def type-id='type-id-1115' const='yes' id='type-id-1429'/>
     <reference-type-def kind='lvalue' type-id='type-id-1429' size-in-bits='64' id='type-id-1430'/>
-    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-500'/>
-    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1431' size-in-bits='64' id='type-id-943'/>
-    <pointer-type-def type-id='type-id-1431' size-in-bits='64' id='type-id-1432'/>
-    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1433'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1433' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-1433' size-in-bits='64' id='type-id-1435'/>
-    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1436'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1436' size-in-bits='64' id='type-id-1437'/>
-    <pointer-type-def type-id='type-id-1436' size-in-bits='64' id='type-id-1438'/>
-    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1439'/>
-    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
-    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1441' size-in-bits='64' id='type-id-1442'/>
-    <pointer-type-def type-id='type-id-1441' size-in-bits='64' id='type-id-1443'/>
-    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1444'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1444' size-in-bits='64' id='type-id-1445'/>
-    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-451'/>
-    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1446' size-in-bits='64' id='type-id-1447'/>
-    <pointer-type-def type-id='type-id-1446' size-in-bits='64' id='type-id-1448'/>
-    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1449'/>
-    <pointer-type-def type-id='type-id-1449' size-in-bits='64' id='type-id-1450'/>
-    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1451'/>
-    <pointer-type-def type-id='type-id-1451' size-in-bits='64' id='type-id-1452'/>
-    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1453'/>
-    <pointer-type-def type-id='type-id-1453' size-in-bits='64' id='type-id-507'/>
-    <qualified-type-def type-id='type-id-1454' const='yes' id='type-id-1455'/>
+    <pointer-type-def type-id='type-id-1429' size-in-bits='64' id='type-id-1431'/>
+    <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1432'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
+    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1434'/>
+    <qualified-type-def type-id='type-id-1119' const='yes' id='type-id-1435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1435' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-500'/>
+    <qualified-type-def type-id='type-id-1121' const='yes' id='type-id-1437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1437' size-in-bits='64' id='type-id-943'/>
+    <pointer-type-def type-id='type-id-1437' size-in-bits='64' id='type-id-1438'/>
+    <qualified-type-def type-id='type-id-1124' const='yes' id='type-id-1439'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1439' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-1439' size-in-bits='64' id='type-id-1441'/>
+    <qualified-type-def type-id='type-id-1127' const='yes' id='type-id-1442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1442' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-1442' size-in-bits='64' id='type-id-1444'/>
+    <qualified-type-def type-id='type-id-1130' const='yes' id='type-id-1445'/>
+    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-1446'/>
+    <qualified-type-def type-id='type-id-1132' const='yes' id='type-id-1447'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1447' size-in-bits='64' id='type-id-1448'/>
+    <pointer-type-def type-id='type-id-1447' size-in-bits='64' id='type-id-1449'/>
+    <qualified-type-def type-id='type-id-1134' const='yes' id='type-id-1450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1450' size-in-bits='64' id='type-id-1451'/>
+    <pointer-type-def type-id='type-id-1450' size-in-bits='64' id='type-id-451'/>
+    <qualified-type-def type-id='type-id-851' const='yes' id='type-id-1452'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1452' size-in-bits='64' id='type-id-1453'/>
+    <pointer-type-def type-id='type-id-1452' size-in-bits='64' id='type-id-1454'/>
+    <qualified-type-def type-id='type-id-1139' const='yes' id='type-id-1455'/>
     <pointer-type-def type-id='type-id-1455' size-in-bits='64' id='type-id-1456'/>
-    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1457'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
-    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-477'/>
-    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1459'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1459' size-in-bits='64' id='type-id-1460'/>
-    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-1461'/>
-    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1462'/>
-    <pointer-type-def type-id='type-id-1462' size-in-bits='64' id='type-id-475'/>
-    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1463'/>
+    <qualified-type-def type-id='type-id-1141' const='yes' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-1457' size-in-bits='64' id='type-id-1458'/>
+    <qualified-type-def type-id='type-id-1143' const='yes' id='type-id-1459'/>
+    <pointer-type-def type-id='type-id-1459' size-in-bits='64' id='type-id-507'/>
+    <qualified-type-def type-id='type-id-1460' const='yes' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1462'/>
+    <qualified-type-def type-id='type-id-1145' const='yes' id='type-id-1463'/>
     <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1464'/>
-    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-472'/>
-    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1465'/>
-    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-473'/>
-    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1466'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1466' size-in-bits='64' id='type-id-1467'/>
-    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-1468'/>
-    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1469'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-932'/>
-    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
-    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1471'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-938'/>
-    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
-    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1473'/>
-    <pointer-type-def type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
-    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1475'/>
-    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-493'/>
-    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1476' size-in-bits='64' id='type-id-1477'/>
-    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-1478'/>
-    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
-    <pointer-type-def type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
-    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1482'/>
+    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-477'/>
+    <qualified-type-def type-id='type-id-1148' const='yes' id='type-id-1465'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
+    <pointer-type-def type-id='type-id-1465' size-in-bits='64' id='type-id-1467'/>
+    <qualified-type-def type-id='type-id-1151' const='yes' id='type-id-1468'/>
+    <pointer-type-def type-id='type-id-1468' size-in-bits='64' id='type-id-475'/>
+    <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1469'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-472'/>
+    <qualified-type-def type-id='type-id-1155' const='yes' id='type-id-1471'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-473'/>
+    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1472'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1472' size-in-bits='64' id='type-id-1473'/>
+    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-1474'/>
+    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1475'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1475' size-in-bits='64' id='type-id-932'/>
+    <pointer-type-def type-id='type-id-1475' size-in-bits='64' id='type-id-1476'/>
+    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1477' size-in-bits='64' id='type-id-938'/>
+    <pointer-type-def type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
+    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1479'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1480'/>
+    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1481'/>
+    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-493'/>
+    <qualified-type-def type-id='type-id-853' const='yes' id='type-id-1482'/>
     <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
-    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-464'/>
-    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1484'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1484' size-in-bits='64' id='type-id-1485'/>
-    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1486'/>
-    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1487'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1487' size-in-bits='64' id='type-id-1488'/>
-    <pointer-type-def type-id='type-id-1487' size-in-bits='64' id='type-id-1489'/>
-    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1490'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1484'/>
+    <qualified-type-def type-id='type-id-1485' const='yes' id='type-id-1486'/>
+    <pointer-type-def type-id='type-id-1486' size-in-bits='64' id='type-id-1487'/>
+    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1488' size-in-bits='64' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-1488' size-in-bits='64' id='type-id-464'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1490'/>
     <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
     <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1492'/>
-    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1493'/>
+    <qualified-type-def type-id='type-id-1174' const='yes' id='type-id-1493'/>
     <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1495'/>
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1496'/>
-    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
-    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1498'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
-    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1500'/>
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1501'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1501' size-in-bits='64' id='type-id-1502'/>
-    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-484'/>
-    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1503'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1505'/>
-    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1506' size-in-bits='64' id='type-id-1507'/>
-    <pointer-type-def type-id='type-id-1506' size-in-bits='64' id='type-id-1508'/>
-    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1509'/>
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
-    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
-    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-526'/>
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1514'/>
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1515'/>
-    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1516'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
-    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1518'/>
-    <pointer-type-def type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
-    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1520' size-in-bits='64' id='type-id-1521'/>
-    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-529'/>
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-1177' const='yes' id='type-id-1496'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
+    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1501'/>
+    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1504'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1506'/>
+    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1507'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-484'/>
+    <qualified-type-def type-id='type-id-856' const='yes' id='type-id-1509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
+    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1511'/>
+    <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
+    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1514'/>
+    <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1515'/>
+    <pointer-type-def type-id='type-id-1515' size-in-bits='64' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1190' const='yes' id='type-id-1517'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-526'/>
+    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1519'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1519' size-in-bits='64' id='type-id-1520'/>
+    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-1521'/>
+    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1522'/>
     <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
-    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1524'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
-    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-530'/>
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1526'/>
+    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1524'/>
+    <pointer-type-def type-id='type-id-1524' size-in-bits='64' id='type-id-1525'/>
+    <qualified-type-def type-id='type-id-1199' const='yes' id='type-id-1526'/>
     <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1527'/>
-    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-522'/>
-    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1528'/>
+    <pointer-type-def type-id='type-id-1526' size-in-bits='64' id='type-id-529'/>
+    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1528'/>
     <pointer-type-def type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
-    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1530'/>
+    <qualified-type-def type-id='type-id-1203' const='yes' id='type-id-1530'/>
     <reference-type-def kind='lvalue' type-id='type-id-1530' size-in-bits='64' id='type-id-1531'/>
-    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-1532'/>
-    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1533'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1534'/>
-    <pointer-type-def type-id='type-id-1533' size-in-bits='64' id='type-id-1535'/>
-    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1536'/>
+    <pointer-type-def type-id='type-id-1530' size-in-bits='64' id='type-id-530'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-1532'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1532' size-in-bits='64' id='type-id-1533'/>
+    <pointer-type-def type-id='type-id-1532' size-in-bits='64' id='type-id-522'/>
+    <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1534'/>
+    <pointer-type-def type-id='type-id-1534' size-in-bits='64' id='type-id-1535'/>
+    <qualified-type-def type-id='type-id-1209' const='yes' id='type-id-1536'/>
     <reference-type-def kind='lvalue' type-id='type-id-1536' size-in-bits='64' id='type-id-1537'/>
     <pointer-type-def type-id='type-id-1536' size-in-bits='64' id='type-id-1538'/>
-    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1539'/>
+    <qualified-type-def type-id='type-id-860' const='yes' id='type-id-1539'/>
     <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1540'/>
     <pointer-type-def type-id='type-id-1539' size-in-bits='64' id='type-id-1541'/>
-    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1542'/>
+    <qualified-type-def type-id='type-id-1212' const='yes' id='type-id-1542'/>
     <reference-type-def kind='lvalue' type-id='type-id-1542' size-in-bits='64' id='type-id-1543'/>
     <pointer-type-def type-id='type-id-1542' size-in-bits='64' id='type-id-1544'/>
-    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1545'/>
+    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1545'/>
     <reference-type-def kind='lvalue' type-id='type-id-1545' size-in-bits='64' id='type-id-1546'/>
     <pointer-type-def type-id='type-id-1545' size-in-bits='64' id='type-id-1547'/>
-    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1548'/>
-    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-520'/>
-    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1549'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-1550'/>
-    <pointer-type-def type-id='type-id-1549' size-in-bits='64' id='type-id-525'/>
-    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1551'/>
+    <qualified-type-def type-id='type-id-1218' const='yes' id='type-id-1548'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
+    <pointer-type-def type-id='type-id-1548' size-in-bits='64' id='type-id-1550'/>
+    <qualified-type-def type-id='type-id-1221' const='yes' id='type-id-1551'/>
     <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1552'/>
-    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-445'/>
-    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1553'/>
-    <pointer-type-def type-id='type-id-1553' size-in-bits='64' id='type-id-446'/>
-    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1554'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1554' size-in-bits='64' id='type-id-1555'/>
-    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-454'/>
-    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1556' size-in-bits='64' id='type-id-1557'/>
-    <pointer-type-def type-id='type-id-1556' size-in-bits='64' id='type-id-504'/>
-    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1558'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1558' size-in-bits='64' id='type-id-1559'/>
-    <pointer-type-def type-id='type-id-1558' size-in-bits='64' id='type-id-505'/>
-    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1560'/>
-    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-458'/>
-    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1561'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1561' size-in-bits='64' id='type-id-1562'/>
-    <pointer-type-def type-id='type-id-1561' size-in-bits='64' id='type-id-443'/>
-    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1563'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1563' size-in-bits='64' id='type-id-1564'/>
-    <pointer-type-def type-id='type-id-1563' size-in-bits='64' id='type-id-460'/>
-    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
-    <pointer-type-def type-id='type-id-1565' size-in-bits='64' id='type-id-452'/>
-    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1567'/>
-    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-479'/>
-    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1568' size-in-bits='64' id='type-id-478'/>
-    <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-476'/>
-    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1569'/>
-    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-465'/>
-    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1570'/>
-    <pointer-type-def type-id='type-id-1570' size-in-bits='64' id='type-id-456'/>
-    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1571'/>
+    <pointer-type-def type-id='type-id-1551' size-in-bits='64' id='type-id-1553'/>
+    <qualified-type-def type-id='type-id-862' const='yes' id='type-id-1554'/>
+    <pointer-type-def type-id='type-id-1554' size-in-bits='64' id='type-id-520'/>
+    <qualified-type-def type-id='type-id-864' const='yes' id='type-id-1555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1555' size-in-bits='64' id='type-id-1556'/>
+    <pointer-type-def type-id='type-id-1555' size-in-bits='64' id='type-id-525'/>
+    <qualified-type-def type-id='type-id-866' const='yes' id='type-id-1557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1558'/>
+    <pointer-type-def type-id='type-id-1557' size-in-bits='64' id='type-id-445'/>
+    <qualified-type-def type-id='type-id-1226' const='yes' id='type-id-1559'/>
+    <pointer-type-def type-id='type-id-1559' size-in-bits='64' id='type-id-446'/>
+    <qualified-type-def type-id='type-id-868' const='yes' id='type-id-1560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1560' size-in-bits='64' id='type-id-1561'/>
+    <pointer-type-def type-id='type-id-1560' size-in-bits='64' id='type-id-454'/>
+    <qualified-type-def type-id='type-id-870' const='yes' id='type-id-1562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1562' size-in-bits='64' id='type-id-1563'/>
+    <pointer-type-def type-id='type-id-1562' size-in-bits='64' id='type-id-504'/>
+    <qualified-type-def type-id='type-id-872' const='yes' id='type-id-1564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
+    <pointer-type-def type-id='type-id-1564' size-in-bits='64' id='type-id-505'/>
+    <qualified-type-def type-id='type-id-1230' const='yes' id='type-id-1566'/>
+    <pointer-type-def type-id='type-id-1566' size-in-bits='64' id='type-id-458'/>
+    <qualified-type-def type-id='type-id-874' const='yes' id='type-id-1567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1567' size-in-bits='64' id='type-id-1568'/>
+    <pointer-type-def type-id='type-id-1567' size-in-bits='64' id='type-id-443'/>
+    <qualified-type-def type-id='type-id-876' const='yes' id='type-id-1569'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1569' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-460'/>
+    <qualified-type-def type-id='type-id-1233' const='yes' id='type-id-1571'/>
     <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
-    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-455'/>
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1573'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1573' size-in-bits='64' id='type-id-1574'/>
-    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-494'/>
-    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1575'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1575' size-in-bits='64' id='type-id-1576'/>
-    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-495'/>
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1577'/>
+    <pointer-type-def type-id='type-id-1571' size-in-bits='64' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-1235' const='yes' id='type-id-1573'/>
+    <pointer-type-def type-id='type-id-1573' size-in-bits='64' id='type-id-479'/>
+    <qualified-type-def type-id='type-id-1236' const='yes' id='type-id-1574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1574' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-1574' size-in-bits='64' id='type-id-476'/>
+    <qualified-type-def type-id='type-id-1237' const='yes' id='type-id-1575'/>
+    <pointer-type-def type-id='type-id-1575' size-in-bits='64' id='type-id-465'/>
+    <qualified-type-def type-id='type-id-1238' const='yes' id='type-id-1576'/>
+    <pointer-type-def type-id='type-id-1576' size-in-bits='64' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-878' const='yes' id='type-id-1577'/>
     <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
-    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-485'/>
-    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1579'/>
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-523'/>
-    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1580'/>
-    <pointer-type-def type-id='type-id-1580' size-in-bits='64' id='type-id-461'/>
-    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1581'/>
-    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-528'/>
-    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1582'/>
-    <pointer-type-def type-id='type-id-1582' size-in-bits='64' id='type-id-486'/>
-    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1583'/>
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-537'/>
-    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1584'/>
-    <pointer-type-def type-id='type-id-1584' size-in-bits='64' id='type-id-510'/>
-    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1585'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-515'/>
-    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1587'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-536'/>
-    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1589'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
-    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-535'/>
-    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1591'/>
-    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-481'/>
-    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1592'/>
-    <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1593'/>
+    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-455'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-1579'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
+    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-494'/>
+    <qualified-type-def type-id='type-id-882' const='yes' id='type-id-1581'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
+    <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-495'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-1583'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
+    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-485'/>
+    <qualified-type-def type-id='type-id-1243' const='yes' id='type-id-1585'/>
+    <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-523'/>
+    <qualified-type-def type-id='type-id-886' const='yes' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-1586' size-in-bits='64' id='type-id-461'/>
+    <qualified-type-def type-id='type-id-1244' const='yes' id='type-id-1587'/>
+    <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-528'/>
+    <qualified-type-def type-id='type-id-1245' const='yes' id='type-id-1588'/>
+    <pointer-type-def type-id='type-id-1588' size-in-bits='64' id='type-id-486'/>
+    <qualified-type-def type-id='type-id-1246' const='yes' id='type-id-1589'/>
+    <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-537'/>
+    <qualified-type-def type-id='type-id-1247' const='yes' id='type-id-1590'/>
+    <pointer-type-def type-id='type-id-1590' size-in-bits='64' id='type-id-510'/>
+    <qualified-type-def type-id='type-id-888' const='yes' id='type-id-1591'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1591' size-in-bits='64' id='type-id-1592'/>
+    <pointer-type-def type-id='type-id-1591' size-in-bits='64' id='type-id-515'/>
+    <qualified-type-def type-id='type-id-890' const='yes' id='type-id-1593'/>
     <reference-type-def kind='lvalue' type-id='type-id-1593' size-in-bits='64' id='type-id-1594'/>
-    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-498'/>
-    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1595'/>
+    <pointer-type-def type-id='type-id-1593' size-in-bits='64' id='type-id-536'/>
+    <qualified-type-def type-id='type-id-892' const='yes' id='type-id-1595'/>
     <reference-type-def kind='lvalue' type-id='type-id-1595' size-in-bits='64' id='type-id-1596'/>
-    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-499'/>
-    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1597'/>
-    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-468'/>
-    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1598'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1598' size-in-bits='64' id='type-id-1599'/>
-    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-490'/>
-    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1600'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1600' size-in-bits='64' id='type-id-1601'/>
-    <pointer-type-def type-id='type-id-1600' size-in-bits='64' id='type-id-509'/>
-    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1602'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1602' size-in-bits='64' id='type-id-1603'/>
-    <pointer-type-def type-id='type-id-1602' size-in-bits='64' id='type-id-508'/>
-    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1604'/>
-    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
-    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1606'/>
+    <pointer-type-def type-id='type-id-1595' size-in-bits='64' id='type-id-535'/>
+    <qualified-type-def type-id='type-id-1251' const='yes' id='type-id-1597'/>
+    <pointer-type-def type-id='type-id-1597' size-in-bits='64' id='type-id-481'/>
+    <qualified-type-def type-id='type-id-1252' const='yes' id='type-id-1598'/>
+    <pointer-type-def type-id='type-id-1598' size-in-bits='64' id='type-id-470'/>
+    <qualified-type-def type-id='type-id-894' const='yes' id='type-id-1599'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1599' size-in-bits='64' id='type-id-1600'/>
+    <pointer-type-def type-id='type-id-1599' size-in-bits='64' id='type-id-498'/>
+    <qualified-type-def type-id='type-id-896' const='yes' id='type-id-1601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1601' size-in-bits='64' id='type-id-1602'/>
+    <pointer-type-def type-id='type-id-1601' size-in-bits='64' id='type-id-499'/>
+    <qualified-type-def type-id='type-id-1255' const='yes' id='type-id-1603'/>
+    <pointer-type-def type-id='type-id-1603' size-in-bits='64' id='type-id-468'/>
+    <qualified-type-def type-id='type-id-898' const='yes' id='type-id-1604'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1604' size-in-bits='64' id='type-id-1605'/>
+    <pointer-type-def type-id='type-id-1604' size-in-bits='64' id='type-id-490'/>
+    <qualified-type-def type-id='type-id-900' const='yes' id='type-id-1606'/>
     <reference-type-def kind='lvalue' type-id='type-id-1606' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-533'/>
-    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1608'/>
+    <pointer-type-def type-id='type-id-1606' size-in-bits='64' id='type-id-509'/>
+    <qualified-type-def type-id='type-id-902' const='yes' id='type-id-1608'/>
     <reference-type-def kind='lvalue' type-id='type-id-1608' size-in-bits='64' id='type-id-1609'/>
-    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-534'/>
-    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1610'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
-    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-514'/>
-    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1612'/>
-    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1614'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-951'/>
-    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
-    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1616'/>
+    <pointer-type-def type-id='type-id-1608' size-in-bits='64' id='type-id-508'/>
+    <qualified-type-def type-id='type-id-1259' const='yes' id='type-id-1610'/>
+    <pointer-type-def type-id='type-id-1610' size-in-bits='64' id='type-id-1611'/>
+    <qualified-type-def type-id='type-id-1261' const='yes' id='type-id-1612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1612' size-in-bits='64' id='type-id-1613'/>
+    <pointer-type-def type-id='type-id-1612' size-in-bits='64' id='type-id-533'/>
+    <qualified-type-def type-id='type-id-1263' const='yes' id='type-id-1614'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1614' size-in-bits='64' id='type-id-1615'/>
+    <pointer-type-def type-id='type-id-1614' size-in-bits='64' id='type-id-534'/>
+    <qualified-type-def type-id='type-id-1265' const='yes' id='type-id-1616'/>
     <reference-type-def kind='lvalue' type-id='type-id-1616' size-in-bits='64' id='type-id-1617'/>
-    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-1618'/>
-    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1619'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1619' size-in-bits='64' id='type-id-1620'/>
-    <pointer-type-def type-id='type-id-1619' size-in-bits='64' id='type-id-1621'/>
-    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1622'/>
+    <pointer-type-def type-id='type-id-1616' size-in-bits='64' id='type-id-514'/>
+    <qualified-type-def type-id='type-id-1268' const='yes' id='type-id-1618'/>
+    <pointer-type-def type-id='type-id-1618' size-in-bits='64' id='type-id-1619'/>
+    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1620'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1620' size-in-bits='64' id='type-id-951'/>
+    <pointer-type-def type-id='type-id-1620' size-in-bits='64' id='type-id-1621'/>
+    <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1622'/>
     <reference-type-def kind='lvalue' type-id='type-id-1622' size-in-bits='64' id='type-id-1623'/>
-    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-480'/>
-    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1624'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1624' size-in-bits='64' id='type-id-1625'/>
-    <pointer-type-def type-id='type-id-1624' size-in-bits='64' id='type-id-467'/>
-    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1626'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1626' size-in-bits='64' id='type-id-1627'/>
-    <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-469'/>
-    <qualified-type-def type-id='type-id-1628' const='yes' id='type-id-1629'/>
-    <pointer-type-def type-id='type-id-1629' size-in-bits='64' id='type-id-1630'/>
-    <qualified-type-def type-id='type-id-1631' const='yes' id='type-id-1632'/>
-    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-1622' size-in-bits='64' id='type-id-1624'/>
+    <qualified-type-def type-id='type-id-904' const='yes' id='type-id-1625'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1625' size-in-bits='64' id='type-id-1626'/>
+    <pointer-type-def type-id='type-id-1625' size-in-bits='64' id='type-id-1627'/>
+    <qualified-type-def type-id='type-id-906' const='yes' id='type-id-1628'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1628' size-in-bits='64' id='type-id-1629'/>
+    <pointer-type-def type-id='type-id-1628' size-in-bits='64' id='type-id-480'/>
+    <qualified-type-def type-id='type-id-908' const='yes' id='type-id-1630'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1630' size-in-bits='64' id='type-id-1631'/>
+    <pointer-type-def type-id='type-id-1630' size-in-bits='64' id='type-id-467'/>
+    <qualified-type-def type-id='type-id-910' const='yes' id='type-id-1632'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1632' size-in-bits='64' id='type-id-1633'/>
+    <pointer-type-def type-id='type-id-1632' size-in-bits='64' id='type-id-469'/>
     <qualified-type-def type-id='type-id-1634' const='yes' id='type-id-1635'/>
     <pointer-type-def type-id='type-id-1635' size-in-bits='64' id='type-id-1636'/>
-    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1637' size-in-bits='64' id='type-id-1638'/>
-    <pointer-type-def type-id='type-id-1637' size-in-bits='64' id='type-id-1639'/>
-    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1640' size-in-bits='64' id='type-id-1641'/>
-    <pointer-type-def type-id='type-id-1640' size-in-bits='64' id='type-id-1642'/>
-    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1643'/>
-    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1645'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1645' size-in-bits='64' id='type-id-1646'/>
-    <pointer-type-def type-id='type-id-1645' size-in-bits='64' id='type-id-1647'/>
-    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1648'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1648' size-in-bits='64' id='type-id-1649'/>
-    <pointer-type-def type-id='type-id-1648' size-in-bits='64' id='type-id-1650'/>
-    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1651'/>
+    <qualified-type-def type-id='type-id-1637' const='yes' id='type-id-1638'/>
+    <pointer-type-def type-id='type-id-1638' size-in-bits='64' id='type-id-1639'/>
+    <qualified-type-def type-id='type-id-1640' const='yes' id='type-id-1641'/>
+    <pointer-type-def type-id='type-id-1641' size-in-bits='64' id='type-id-1642'/>
+    <qualified-type-def type-id='type-id-1283' const='yes' id='type-id-1643'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1643' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-1643' size-in-bits='64' id='type-id-1645'/>
+    <qualified-type-def type-id='type-id-1286' const='yes' id='type-id-1646'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1646' size-in-bits='64' id='type-id-1647'/>
+    <pointer-type-def type-id='type-id-1646' size-in-bits='64' id='type-id-1648'/>
+    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1649'/>
+    <pointer-type-def type-id='type-id-1649' size-in-bits='64' id='type-id-1650'/>
+    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1651'/>
     <reference-type-def kind='lvalue' type-id='type-id-1651' size-in-bits='64' id='type-id-1652'/>
     <pointer-type-def type-id='type-id-1651' size-in-bits='64' id='type-id-1653'/>
-    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1654'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1654'/>
     <reference-type-def kind='lvalue' type-id='type-id-1654' size-in-bits='64' id='type-id-1655'/>
-    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1656' size-in-bits='64' id='type-id-1657'/>
-    <pointer-type-def type-id='type-id-1656' size-in-bits='64' id='type-id-1658'/>
-    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1659'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1659' size-in-bits='64' id='type-id-1660'/>
-    <pointer-type-def type-id='type-id-1659' size-in-bits='64' id='type-id-1661'/>
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1662'/>
-    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
-    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1664' size-in-bits='64' id='type-id-1665'/>
-    <pointer-type-def type-id='type-id-1664' size-in-bits='64' id='type-id-531'/>
-    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1666'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1666' size-in-bits='64' id='type-id-1667'/>
-    <pointer-type-def type-id='type-id-1666' size-in-bits='64' id='type-id-532'/>
-    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1668'/>
+    <pointer-type-def type-id='type-id-1654' size-in-bits='64' id='type-id-1656'/>
+    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1657' size-in-bits='64' id='type-id-1658'/>
+    <pointer-type-def type-id='type-id-1657' size-in-bits='64' id='type-id-1659'/>
+    <qualified-type-def type-id='type-id-573' const='yes' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1660' size-in-bits='64' id='type-id-1661'/>
+    <qualified-type-def type-id='type-id-1299' const='yes' id='type-id-1662'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1662' size-in-bits='64' id='type-id-1663'/>
+    <pointer-type-def type-id='type-id-1662' size-in-bits='64' id='type-id-1664'/>
+    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1665' size-in-bits='64' id='type-id-1666'/>
+    <pointer-type-def type-id='type-id-1665' size-in-bits='64' id='type-id-1667'/>
+    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1668'/>
     <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1669'/>
-    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1670'/>
+    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1670'/>
     <reference-type-def kind='lvalue' type-id='type-id-1670' size-in-bits='64' id='type-id-1671'/>
-    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-1672'/>
-    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1673'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1673' size-in-bits='64' id='type-id-1674'/>
-    <pointer-type-def type-id='type-id-1673' size-in-bits='64' id='type-id-1675'/>
-    <qualified-type-def type-id='type-id-1676' const='yes' id='type-id-1677'/>
-    <pointer-type-def type-id='type-id-1677' size-in-bits='64' id='type-id-1678'/>
-    <qualified-type-def type-id='type-id-1679' const='yes' id='type-id-1680'/>
-    <pointer-type-def type-id='type-id-1680' size-in-bits='64' id='type-id-1681'/>
+    <pointer-type-def type-id='type-id-1670' size-in-bits='64' id='type-id-531'/>
+    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1672'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1672' size-in-bits='64' id='type-id-1673'/>
+    <pointer-type-def type-id='type-id-1672' size-in-bits='64' id='type-id-532'/>
+    <qualified-type-def type-id='type-id-1311' const='yes' id='type-id-1674'/>
+    <pointer-type-def type-id='type-id-1674' size-in-bits='64' id='type-id-1675'/>
+    <qualified-type-def type-id='type-id-1313' const='yes' id='type-id-1676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-1677'/>
+    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-1678'/>
+    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1679'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-1680'/>
+    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-1681'/>
     <qualified-type-def type-id='type-id-1682' const='yes' id='type-id-1683'/>
     <pointer-type-def type-id='type-id-1683' size-in-bits='64' id='type-id-1684'/>
     <qualified-type-def type-id='type-id-1685' const='yes' id='type-id-1686'/>
     <pointer-type-def type-id='type-id-1686' size-in-bits='64' id='type-id-1687'/>
-    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1688' size-in-bits='64' id='type-id-950'/>
-    <pointer-type-def type-id='type-id-1688' size-in-bits='64' id='type-id-1689'/>
-    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1690'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1690' size-in-bits='64' id='type-id-1691'/>
-    <pointer-type-def type-id='type-id-1690' size-in-bits='64' id='type-id-1692'/>
-    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1693'/>
-    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
-    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1696'/>
-    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1697'/>
-    <pointer-type-def type-id='type-id-1697' size-in-bits='64' id='type-id-1698'/>
-    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1699'/>
-    <pointer-type-def type-id='type-id-1699' size-in-bits='64' id='type-id-1700'/>
-    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1701'/>
-    <pointer-type-def type-id='type-id-1701' size-in-bits='64' id='type-id-1702'/>
-    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1703'/>
+    <qualified-type-def type-id='type-id-1688' const='yes' id='type-id-1689'/>
+    <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
+    <qualified-type-def type-id='type-id-1691' const='yes' id='type-id-1692'/>
+    <pointer-type-def type-id='type-id-1692' size-in-bits='64' id='type-id-1693'/>
+    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1694' size-in-bits='64' id='type-id-950'/>
+    <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1695'/>
+    <qualified-type-def type-id='type-id-1316' const='yes' id='type-id-1696'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1696' size-in-bits='64' id='type-id-1697'/>
+    <pointer-type-def type-id='type-id-1696' size-in-bits='64' id='type-id-1698'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1699'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-1700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1700' size-in-bits='64' id='type-id-1701'/>
+    <pointer-type-def type-id='type-id-1700' size-in-bits='64' id='type-id-1702'/>
+    <qualified-type-def type-id='type-id-912' const='yes' id='type-id-1703'/>
     <pointer-type-def type-id='type-id-1703' size-in-bits='64' id='type-id-1704'/>
-    <qualified-type-def type-id='type-id-1327' const='yes' id='type-id-1705'/>
+    <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1705'/>
     <pointer-type-def type-id='type-id-1705' size-in-bits='64' id='type-id-1706'/>
-    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1707'/>
+    <qualified-type-def type-id='type-id-1323' const='yes' id='type-id-1707'/>
     <pointer-type-def type-id='type-id-1707' size-in-bits='64' id='type-id-1708'/>
-    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1709'/>
+    <qualified-type-def type-id='type-id-1325' const='yes' id='type-id-1709'/>
     <pointer-type-def type-id='type-id-1709' size-in-bits='64' id='type-id-1710'/>
-    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1711'/>
+    <qualified-type-def type-id='type-id-1329' const='yes' id='type-id-1711'/>
     <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1712'/>
-    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1713'/>
+    <qualified-type-def type-id='type-id-1331' const='yes' id='type-id-1713'/>
     <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1714'/>
-    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1715'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1715' size-in-bits='64' id='type-id-946'/>
+    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1715'/>
+    <pointer-type-def type-id='type-id-1715' size-in-bits='64' id='type-id-1716'/>
+    <qualified-type-def type-id='type-id-1337' const='yes' id='type-id-1717'/>
+    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-1718'/>
+    <qualified-type-def type-id='type-id-1343' const='yes' id='type-id-1719'/>
+    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1721'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-946'/>
     <qualified-type-def type-id='type-id-1' const='yes' id='type-id-931'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1716'/>
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1717'/>
-    <pointer-type-def type-id='type-id-1717' size-in-bits='64' id='type-id-933'/>
-    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1718'/>
-    <pointer-type-def type-id='type-id-1718' size-in-bits='64' id='type-id-960'/>
-    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1719'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1719' size-in-bits='64' id='type-id-1720'/>
-    <pointer-type-def type-id='type-id-1719' size-in-bits='64' id='type-id-954'/>
-    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1721'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1721' size-in-bits='64' id='type-id-973'/>
-    <pointer-type-def type-id='type-id-1721' size-in-bits='64' id='type-id-955'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-1722'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1723'/>
+    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-933'/>
+    <qualified-type-def type-id='type-id-953' const='yes' id='type-id-1724'/>
+    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-960'/>
+    <qualified-type-def type-id='type-id-916' const='yes' id='type-id-1725'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1725' size-in-bits='64' id='type-id-1726'/>
+    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-954'/>
+    <qualified-type-def type-id='type-id-918' const='yes' id='type-id-1727'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1727' size-in-bits='64' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-955'/>
     <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-965'/>
-    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1722' size-in-bits='64' id='type-id-978'/>
-    <qualified-type-def type-id='type-id-1723' const='yes' id='type-id-1724'/>
-    <pointer-type-def type-id='type-id-1724' size-in-bits='64' id='type-id-962'/>
-    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1725'/>
-    <pointer-type-def type-id='type-id-1725' size-in-bits='64' id='type-id-969'/>
-    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1726'/>
-    <pointer-type-def type-id='type-id-1726' size-in-bits='64' id='type-id-972'/>
-    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1727'/>
-    <pointer-type-def type-id='type-id-1727' size-in-bits='64' id='type-id-977'/>
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1728'/>
-    <pointer-type-def type-id='type-id-1728' size-in-bits='64' id='type-id-983'/>
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1729'/>
-    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-988'/>
-    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1730'/>
-    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-989'/>
-    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1731'/>
-    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-991'/>
-    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1732'/>
-    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-993'/>
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1733'/>
-    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-1734'/>
-    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1735'/>
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1736'/>
+    <qualified-type-def type-id='type-id-921' const='yes' id='type-id-1728'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1728' size-in-bits='64' id='type-id-978'/>
+    <qualified-type-def type-id='type-id-1729' const='yes' id='type-id-1730'/>
+    <pointer-type-def type-id='type-id-1730' size-in-bits='64' id='type-id-962'/>
+    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-1731'/>
+    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-923' const='yes' id='type-id-1732'/>
+    <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-972'/>
+    <qualified-type-def type-id='type-id-925' const='yes' id='type-id-1733'/>
+    <pointer-type-def type-id='type-id-1733' size-in-bits='64' id='type-id-977'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-1734'/>
+    <pointer-type-def type-id='type-id-1734' size-in-bits='64' id='type-id-983'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-1735'/>
+    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-988'/>
+    <qualified-type-def type-id='type-id-981' const='yes' id='type-id-1736'/>
+    <pointer-type-def type-id='type-id-1736' size-in-bits='64' id='type-id-989'/>
+    <qualified-type-def type-id='type-id-986' const='yes' id='type-id-1737'/>
+    <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-991'/>
+    <qualified-type-def type-id='type-id-982' const='yes' id='type-id-1738'/>
+    <pointer-type-def type-id='type-id-1738' size-in-bits='64' id='type-id-993'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1739'/>
+    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
+    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-1741'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-1742'/>
     <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-942'/>
     <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-945'/>
     <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-949'/>
@@ -9846,7 +9849,7 @@
     <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-966'/>
     <reference-type-def kind='lvalue' type-id='type-id-918' size-in-bits='64' id='type-id-975'/>
     <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-971'/>
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-1743'/>
     <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-976'/>
     <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-967'/>
     <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-974'/>
@@ -9856,10 +9859,7 @@
     <pointer-type-def type-id='type-id-981' size-in-bits='64' id='type-id-990'/>
     <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-992'/>
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-994'/>
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1738'/>
-    <pointer-type-def type-id='type-id-1739' size-in-bits='64' id='type-id-1740'/>
-    <pointer-type-def type-id='type-id-1741' size-in-bits='64' id='type-id-1742'/>
-    <pointer-type-def type-id='type-id-1743' size-in-bits='64' id='type-id-1744'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1744'/>
     <pointer-type-def type-id='type-id-1745' size-in-bits='64' id='type-id-957'/>
     <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
@@ -9897,7 +9897,7 @@
     <pointer-type-def type-id='type-id-1810' size-in-bits='64' id='type-id-1811'/>
     <qualified-type-def type-id='type-id-1812' const='yes' id='type-id-1813'/>
     <pointer-type-def type-id='type-id-1813' size-in-bits='64' id='type-id-1814'/>
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
@@ -9945,16 +9945,16 @@
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-962' is-artificial='yes'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-962' is-artificial='yes'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -9982,36 +9982,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -10024,8 +10024,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -10045,28 +10045,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT21AlternateSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT21AlternateSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT21AlternateSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT21AlternateSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -10079,7 +10079,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT21AlternateSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -10117,8 +10117,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT6Anchor10get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-163'/>
             <parameter type-id='type-id-163'/>
@@ -10152,7 +10152,7 @@
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat110get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-517' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-163'/>
             <parameter type-id='type-id-163'/>
@@ -10189,7 +10189,7 @@
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat210get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-518' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-163'/>
             <parameter type-id='type-id-163'/>
@@ -10229,7 +10229,7 @@
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat310get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-519' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-163'/>
             <parameter type-id='type-id-163'/>
@@ -10261,8 +10261,8 @@
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-18'/>
-            <parameter type-id='type-id-1343'/>
-            <return type-id='type-id-1352'/>
+            <parameter type-id='type-id-1349'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10295,7 +10295,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-516' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1447'/>
+            <return type-id='type-id-1453'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10314,14 +10314,14 @@
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-1478'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1477'/>
+            <return type-id='type-id-1483'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10419,7 +10419,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-521' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1527'/>
+            <return type-id='type-id-1533'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10503,7 +10503,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-444' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1552'/>
+            <return type-id='type-id-1558'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10570,7 +10570,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-502' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1557'/>
+            <return type-id='type-id-1563'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10603,7 +10603,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-501' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1559'/>
+            <return type-id='type-id-1565'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10642,7 +10642,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-506' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1562'/>
+            <return type-id='type-id-1568'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10675,7 +10675,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-459' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1564'/>
+            <return type-id='type-id-1570'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10723,7 +10723,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-447' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1572'/>
+            <return type-id='type-id-1578'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10741,7 +10741,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-492' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1574'/>
+            <return type-id='type-id-1580'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10795,7 +10795,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-491' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1576'/>
+            <return type-id='type-id-1582'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10891,7 +10891,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-513' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1586'/>
+            <return type-id='type-id-1592'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -10944,7 +10944,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-512' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1590'/>
+            <return type-id='type-id-1596'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -10969,7 +10969,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-497' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1594'/>
+            <return type-id='type-id-1600'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11002,7 +11002,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-496' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1596'/>
+            <return type-id='type-id-1602'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11035,7 +11035,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-489' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1599'/>
+            <return type-id='type-id-1605'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11103,7 +11103,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-488' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1603'/>
+            <return type-id='type-id-1609'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11135,7 +11135,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-442' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1620'/>
+            <return type-id='type-id-1626'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -11180,7 +11180,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-471' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1623'/>
+            <return type-id='type-id-1629'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11221,7 +11221,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-466' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1625'/>
+            <return type-id='type-id-1631'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11262,7 +11262,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='806' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-462' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1627'/>
+            <return type-id='type-id-1633'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11301,7 +11301,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT10AttachList17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1391' is-artificial='yes'/>
+            <parameter type-id='type-id-1397' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
@@ -11350,8 +11350,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT10CaretValue15get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1394' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1400' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-103'/>
@@ -11381,7 +11381,7 @@
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat115get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-449' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-103'/>
@@ -11411,7 +11411,7 @@
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat215get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-450' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-103'/>
@@ -11444,7 +11444,7 @@
         <member-function access='public'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat315get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-453' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-103'/>
@@ -11473,29 +11473,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -11508,15 +11508,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT12ChainContext8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1399' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -11560,21 +11560,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1858' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1813' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1846' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -11587,15 +11587,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1863' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1831' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1402' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -11624,14 +11624,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1961' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1942' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -11644,22 +11644,22 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1966' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1896' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1921' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1405' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -11685,21 +11685,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT19ChainContextFormat312get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2081' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2020' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT19ChainContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2063' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -11712,15 +11712,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT19ChainContextFormat35applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2087' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT19ChainContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2042' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -11749,16 +11749,16 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT9ChainRule7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1675' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-1085'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT9ChainRule11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1703' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1083'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -11772,7 +11772,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT9ChainRule5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1716' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-1083'/>
             <return type-id='type-id-1'/>
@@ -11780,8 +11780,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9ChainRule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1689' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1411' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-1087'/>
             <return type-id='type-id-25'/>
           </function-decl>
@@ -11803,31 +11803,31 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT12ChainRuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1776' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1083'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT12ChainRuleSet7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1760' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-1085'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT12ChainRuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_38ChainContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1768' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-1087'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT12ChainRuleSet5applyEPNS_18hb_apply_context_tERNS_30ChainContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1787' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1414' is-artificial='yes'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-1083'/>
             <return type-id='type-id-1'/>
@@ -11863,14 +11863,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_class' mangled-name='_ZNK2OT8ClassDef9get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1050' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects_class' mangled-name='_ZNK2OT8ClassDef16intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1077' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -11878,7 +11878,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='add_class' mangled-name='_ZNK2OT8ClassDef9add_classEP8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1069' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1417' is-artificial='yes'/>
+            <parameter type-id='type-id-1423' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-25'/>
@@ -11934,14 +11934,14 @@
           <var-decl name='classFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1040' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1045' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='add_class&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1008' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-25'/>
@@ -11949,7 +11949,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat29get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='994' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
@@ -11963,7 +11963,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='intersects_class' mangled-name='_ZNK2OT15ClassDefFormat216intersects_classEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1015' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-1426' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -11992,29 +11992,29 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -12027,15 +12027,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT7Context8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1422' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -12094,21 +12094,21 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1251' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1285' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -12121,15 +12121,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1302' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1270' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12152,14 +12152,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT14ContextFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1374' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -12172,22 +12172,22 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT14ContextFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1393' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1337' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1428' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1434' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12220,14 +12220,14 @@
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-500' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT14ContextFormat311would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1466' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-500' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -12248,7 +12248,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14ContextFormat314collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1449' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-500' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12338,14 +12338,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT8Coverage19intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -12353,21 +12353,21 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT8Coverage12get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='808' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' mangled-name='_ZNK2OT8Coverage12add_coverageI8hb_set_tEEvPT_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects' mangled-name='_ZNK2OT8Coverage10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='845' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12382,7 +12382,7 @@
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='864' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1845' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12400,7 +12400,7 @@
         <member-type access='public'>
           <class-decl name='Iter' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='672' column='1' id='type-id-1125'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-1435' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
+              <var-decl name='c' type-id='type-id-1441' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='680' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='681' column='1'/>
@@ -12420,7 +12420,7 @@
             <member-function access='public'>
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat14Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1126' is-artificial='yes'/>
-                <parameter type-id='type-id-1434'/>
+                <parameter type-id='type-id-1440'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
@@ -12442,35 +12442,35 @@
           <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='glyphArray' type-id='type-id-1676' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
+          <var-decl name='glyphArray' type-id='type-id-1682' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='690' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat112get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat119intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='659' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -12486,7 +12486,7 @@
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1846' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12504,7 +12504,7 @@
         <member-type access='public'>
           <class-decl name='Iter' size-in-bits='192' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='769' column='1' id='type-id-1128'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='c' type-id='type-id-1438' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
+              <var-decl name='c' type-id='type-id-1444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='791' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='i' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='792' column='1'/>
@@ -12530,7 +12530,7 @@
             <member-function access='public'>
               <function-decl name='init' mangled-name='_ZN2OT15CoverageFormat24Iter4initERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1129' is-artificial='yes'/>
-                <parameter type-id='type-id-1437'/>
+                <parameter type-id='type-id-1443'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
@@ -12552,35 +12552,35 @@
           <var-decl name='coverageFormat' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='797' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='rangeRecord' type-id='type-id-1679' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
+          <var-decl name='rangeRecord' type-id='type-id-1685' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='803' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat212get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='intersects_coverage' mangled-name='_ZNK2OT15CoverageFormat219intersects_coverageEPK8hb_set_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-1444' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -12596,7 +12596,7 @@
         <member-function access='private'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12626,22 +12626,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1440' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1446' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -12668,14 +12668,14 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT17CursivePosFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='882' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17CursivePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -12688,7 +12688,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT17CursivePosFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='887' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -12733,14 +12733,14 @@
         <member-function access='public'>
           <function-decl name='get_x_delta' mangled-name='_ZNK2OT6Device11get_x_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-451' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <return type-id='type-id-103'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_y_delta' mangled-name='_ZNK2OT6Device11get_y_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-451' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-153'/>
             <return type-id='type-id-103'/>
           </function-decl>
         </member-function>
@@ -12781,26 +12781,26 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::PosLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <return type-id='type-id-1617'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
@@ -12813,14 +12813,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT9ExtensionINS_12ExtensionPosEE8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS5_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
+            <parameter type-id='type-id-1456' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
@@ -12849,54 +12849,54 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <return type-id='type-id-1691'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_offset' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE10get_offsetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_type' mangled-name='_ZNK2OT9ExtensionINS_14ExtensionSubstEE8get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
@@ -12916,14 +12916,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_subtable&lt;OT::SubstLookupSubTable&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <return type-id='type-id-1691'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1452' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1458' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -12967,11 +12967,11 @@
       <class-decl name='ExtensionPos' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1360' column='1' id='type-id-1850'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1139'/>
       </class-decl>
-      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1454'>
+      <class-decl name='ExtensionSubst' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='921' column='1' id='type-id-1460'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1141'/>
         <member-function access='public'>
           <function-decl name='is_reverse' mangled-name='_ZNK2OT14ExtensionSubst10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='924' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -12981,7 +12981,7 @@
           <var-decl name='featureParams' type-id='type-id-1236' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='532' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='16'>
-          <var-decl name='lookupIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
+          <var-decl name='lookupIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='536' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='538' column='1'/>
@@ -12997,7 +12997,7 @@
         <member-function access='public'>
           <function-decl name='get_feature_params' mangled-name='_ZNK2OT7Feature18get_feature_paramsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-477' is-artificial='yes'/>
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -13043,9 +13043,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size_params' mangled-name='_ZNK2OT13FeatureParams15get_size_paramsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1467' is-artificial='yes'/>
             <parameter type-id='type-id-184'/>
-            <return type-id='type-id-1464'/>
+            <return type-id='type-id-1470'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -13160,13 +13160,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='has_glyph_classes' mangled-name='_ZNK2OT4GDEF17has_glyph_classesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='mark_set_covers' mangled-name='_ZNK2OT4GDEF15mark_set_coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-1'/>
@@ -13174,22 +13174,22 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph_class' mangled-name='_ZNK2OT4GDEF15get_glyph_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_mark_attachment_type' mangled-name='_ZNK2OT4GDEF24get_mark_attachment_typeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT4GDEF14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
@@ -13200,7 +13200,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT4GDEF17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
@@ -13210,7 +13210,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyphs_in_class' mangled-name='_ZNK2OT4GDEF19get_glyphs_in_classEjP8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-964'/>
             <return type-id='type-id-25'/>
@@ -13218,7 +13218,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph_props' mangled-name='_ZNK2OT4GDEF15get_glyph_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-18'/>
           </function-decl>
@@ -13244,21 +13244,21 @@
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='position_finish' mangled-name='_ZN2OT4GPOS15position_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1524' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='position_start' mangled-name='_ZN2OT4GPOS14position_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1523' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1520' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-1476' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-951'/>
           </function-decl>
@@ -13284,21 +13284,21 @@
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='substitute_finish' mangled-name='_ZN2OT4GSUB17substitute_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='substitute_start' mangled-name='_ZN2OT4GSUB16substitute_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GSUB10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1321' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-1478' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-950'/>
           </function-decl>
@@ -13338,27 +13338,27 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lookup' mangled-name='_ZNK2OT8GSUBGPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2291' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT8GSUBGPOS17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature' mangled-name='_ZNK2OT8GSUBGPOS11get_featureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2284' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_tags' mangled-name='_ZNK2OT8GSUBGPOS16get_feature_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2280' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -13367,7 +13367,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_script_tags' mangled-name='_ZNK2OT8GSUBGPOS15get_script_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2267' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -13376,13 +13376,13 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lookup_count' mangled-name='_ZNK2OT8GSUBGPOS16get_lookup_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='find_script_index' mangled-name='_ZNK2OT8GSUBGPOS17find_script_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-184'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-1'/>
@@ -13390,14 +13390,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_script' mangled-name='_ZNK2OT8GSUBGPOS10get_scriptEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2271' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_feature_tag' mangled-name='_ZNK2OT8GSUBGPOS15get_feature_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2278' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-1480' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-184'/>
           </function-decl>
@@ -13463,11 +13463,11 @@
           <var-decl name='NOT_FOUND_INDEX' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1479'>
+      <class-decl name='IndexArray' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='161' column='1' id='type-id-1485'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
         <member-function access='public'>
           <function-decl name='get_indexes' mangled-name='_ZNK2OT10IndexArray11get_indexesEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1481' is-artificial='yes'/>
+            <parameter type-id='type-id-1487' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
@@ -13484,7 +13484,7 @@
           <var-decl name='reqFeatureIndex' type-id='type-id-371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='209' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='featureIndex' type-id='type-id-1479' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
+          <var-decl name='featureIndex' type-id='type-id-1485' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='212' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='214' column='1'/>
@@ -13551,8 +13551,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT12LigCaretList14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1486' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
@@ -13578,8 +13578,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT8LigGlyph14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
@@ -13601,22 +13601,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Ligature7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Ligature14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT8Ligature11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='621' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13629,7 +13629,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT8Ligature5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1492' is-artificial='yes'/>
+            <parameter type-id='type-id-1498' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -13654,22 +13654,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT11LigatureSet7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11LigatureSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='714' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT11LigatureSet11would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='722' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13682,7 +13682,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT11LigatureSet5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1495' is-artificial='yes'/>
+            <parameter type-id='type-id-1501' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -13715,36 +13715,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -13757,8 +13757,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1497' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1503' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -13791,28 +13791,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20LigatureSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='802' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20LigatureSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20LigatureSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT20LigatureSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='807' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -13825,7 +13825,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT20LigatureSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='817' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1500' is-artificial='yes'/>
+            <parameter type-id='type-id-1506' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -13921,11 +13921,11 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT9MarkArray5applyEPNS_18hb_apply_context_tEjjRKNS_12AnchorMatrixEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='393' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1508' is-artificial='yes'/>
+            <parameter type-id='type-id-1514' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-18'/>
-            <parameter type-id='type-id-1358'/>
+            <parameter type-id='type-id-1364'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
@@ -13948,22 +13948,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1089' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1510' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1516' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -14009,7 +14009,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkBasePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1023' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-526' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -14047,7 +14047,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='covers' mangled-name='_ZNK2OT13MarkGlyphSets6coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1515' is-artificial='yes'/>
+            <parameter type-id='type-id-1521' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-1'/>
@@ -14073,7 +14073,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='covers' mangled-name='_ZNK2OT20MarkGlyphSetsFormat16coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1517' is-artificial='yes'/>
+            <parameter type-id='type-id-1523' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-1'/>
@@ -14103,22 +14103,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1210' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1519' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1525' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -14164,7 +14164,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17MarkLigPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-529' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -14199,22 +14199,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1329' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1523' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -14260,7 +14260,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkMarkPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-530' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -14317,36 +14317,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -14359,8 +14359,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1529' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -14380,28 +14380,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT20MultipleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT20MultipleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20MultipleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT20MultipleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -14414,7 +14414,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT20MultipleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1532' is-artificial='yes'/>
+            <parameter type-id='type-id-1538' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -14430,7 +14430,7 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='is_null' mangled-name='_ZNK2OT6OffsetINS_7IntTypeItLj2EEEE7is_nullEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1541' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -14495,9 +14495,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_12AnchorMatrixEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1538' is-artificial='yes'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14505,9 +14505,9 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12OffsetListOfINS_6LookupEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='906' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
+            <parameter type-id='type-id-1547' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14550,7 +14550,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-520' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1352'/>
+            <return type-id='type-id-1358'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14581,7 +14581,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-525' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1358'/>
+            <return type-id='type-id-1364'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14613,7 +14613,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-445' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1361'/>
+            <return type-id='type-id-1367'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14644,7 +14644,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-446' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1390'/>
+            <return type-id='type-id-1396'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14675,7 +14675,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-454' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1393'/>
+            <return type-id='type-id-1399'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14706,7 +14706,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-504' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1410'/>
+            <return type-id='type-id-1416'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14737,7 +14737,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-505' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1413'/>
+            <return type-id='type-id-1419'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14768,7 +14768,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-458' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1416'/>
+            <return type-id='type-id-1422'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14869,7 +14869,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-452' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1445'/>
+            <return type-id='type-id-1451'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14909,7 +14909,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-479' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14941,7 +14941,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-476' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1460'/>
+            <return type-id='type-id-1466'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -14973,7 +14973,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-465' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15004,7 +15004,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-456' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1485'/>
+            <return type-id='type-id-1491'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15035,7 +15035,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-455' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1488'/>
+            <return type-id='type-id-1494'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15066,7 +15066,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-494' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1491'/>
+            <return type-id='type-id-1497'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15105,7 +15105,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-495' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1494'/>
+            <return type-id='type-id-1500'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15144,7 +15144,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-485' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1502'/>
+            <return type-id='type-id-1508'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15175,7 +15175,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-523' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1507'/>
+            <return type-id='type-id-1513'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15206,7 +15206,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-461' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1514'/>
+            <return type-id='type-id-1520'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15246,7 +15246,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-528' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1537'/>
+            <return type-id='type-id-1543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15269,7 +15269,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-486' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1540'/>
+            <return type-id='type-id-1546'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15357,7 +15357,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-515' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1611'/>
+            <return type-id='type-id-1617'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15413,7 +15413,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-535' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15436,7 +15436,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-481' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1638'/>
+            <return type-id='type-id-1644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15467,7 +15467,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-470' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1641'/>
+            <return type-id='type-id-1647'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15498,7 +15498,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-498' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1649'/>
+            <return type-id='type-id-1655'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15529,7 +15529,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-499' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1652'/>
+            <return type-id='type-id-1658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15569,7 +15569,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-468' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15592,7 +15592,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-490' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1660'/>
+            <return type-id='type-id-1666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15656,7 +15656,7 @@
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-508' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15694,22 +15694,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1611' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -15756,7 +15756,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='655' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-533' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -15808,7 +15808,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-534' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -15857,7 +15857,7 @@
           <function-decl name='sanitize' mangled-name='_ZN2OT7PairSet8sanitizeEPNS_21hb_sanitize_context_tEPKNS0_18sanitize_closure_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='634' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1267' is-artificial='yes'/>
             <parameter type-id='type-id-277'/>
-            <parameter type-id='type-id-1613'/>
+            <parameter type-id='type-id-1619'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -15865,7 +15865,7 @@
           <function-decl name='apply' mangled-name='_ZNK2OT7PairSet5applyEPNS_18hb_apply_context_tEPKNS_11ValueFormatEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-514' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1706'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -15873,8 +15873,8 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7PairSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tEPKNS_11ValueFormatE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-514' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
-            <parameter type-id='type-id-1700'/>
+            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1706'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -15883,41 +15883,41 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1182'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1461' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1489' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_subtable' mangled-name='_ZNK2OT9PosLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1445' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1617'/>
+            <return type-id='type-id-1623'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='is_reverse' mangled-name='_ZNK2OT9PosLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1448' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply_once' mangled-name='_ZNK2OT9PosLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1475' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -15931,8 +15931,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT9PosLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1453' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1615' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -16001,23 +16001,23 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT17PosLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1388' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-379'/>
@@ -16050,36 +16050,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT11RangeRecord3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intersects' mangled-name='_ZNK2OT11RangeRecord10intersectsEPK8hb_set_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
             <parameter type-id='type-id-1835'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1621' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16173,18 +16173,18 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1628'>
+      <class-decl name='RecordArrayOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
         <member-function access='public'>
           <function-decl name='get_tag' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE7get_tagEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1693'/>
+            <return type-id='type-id-1699'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7FeatureEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -16192,11 +16192,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1682'/>
+      <class-decl name='RecordArrayOf&lt;OT::LangSys&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1637'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1688'/>
         <member-function access='public'>
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-1'/>
@@ -16204,7 +16204,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_7LangSysEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -16212,11 +16212,11 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1685'/>
+      <class-decl name='RecordArrayOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='83' column='1' id='type-id-1640'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1691'/>
         <member-function access='public'>
           <function-decl name='find_index' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE10find_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-1'/>
@@ -16224,7 +16224,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_tags' mangled-name='_ZNK2OT13RecordArrayOfINS_6ScriptEE8get_tagsEjPjS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -16233,12 +16233,12 @@
         </member-function>
       </class-decl>
       <class-decl name='RecordListOf&lt;OT::Feature&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1283'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1628'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_7FeatureEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1458'/>
+            <return type-id='type-id-1464'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16250,12 +16250,12 @@
         </member-function>
       </class-decl>
       <class-decl name='RecordListOf&lt;OT::Script&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='120' column='1' id='type-id-1286'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1634'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1640'/>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT12RecordListOfINS_6ScriptEEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1657'/>
+            <return type-id='type-id-1663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16282,36 +16282,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -16324,8 +16324,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1054' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -16351,28 +16351,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='979' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='930' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='955' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16385,7 +16385,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='990' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
+            <parameter type-id='type-id-1653' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16409,16 +16409,16 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT4Rule7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-1112'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT4Rule11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1156' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1110'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16432,7 +16432,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT4Rule5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1163' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-1110'/>
             <return type-id='type-id-1'/>
@@ -16440,8 +16440,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT4Rule14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1656' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-1114'/>
             <return type-id='type-id-25'/>
           </function-decl>
@@ -16463,31 +16463,31 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT7RuleSet11would_applyEPNS_24hb_would_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-1110'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT7RuleSet7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-1112'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7RuleSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tERNS_33ContextCollectGlyphsLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-1114'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT7RuleSet5applyEPNS_18hb_apply_context_tERNS_25ContextApplyLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
+            <parameter type-id='type-id-1659' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-1110'/>
             <return type-id='type-id-1'/>
@@ -16504,7 +16504,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4GDEFEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-1468'/>
+            <return type-id='type-id-1474'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16518,7 +16518,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4GPOSEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-1470'/>
+            <return type-id='type-id-1476'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16532,7 +16532,7 @@
         <member-function access='public' static='yes'>
           <function-decl name='lock_instance' mangled-name='_ZN2OT9SanitizerINS_4GSUBEE13lock_instanceEP9hb_blob_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-59'/>
-            <return type-id='type-id-1472'/>
+            <return type-id='type-id-1478'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -16541,15 +16541,15 @@
           <var-decl name='defaultLangSys' type-id='type-id-1237' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='248' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='16'>
-          <var-decl name='langSys' type-id='type-id-1631' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
+          <var-decl name='langSys' type-id='type-id-1637' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <var-decl name='min_size' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='254' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_default_lang_sys' mangled-name='_ZNK2OT6Script20get_default_lang_sysEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
-            <return type-id='type-id-1483'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -16562,7 +16562,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lang_sys_tags' mangled-name='_ZNK2OT6Script17get_lang_sys_tagsEjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-970'/>
@@ -16571,14 +16571,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_lang_sys' mangled-name='_ZNK2OT6Script12get_lang_sysEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1483'/>
+            <return type-id='type-id-1489'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='find_lang_sys_index' mangled-name='_ZNK2OT6Script19find_lang_sys_indexEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1658' is-artificial='yes'/>
+            <parameter type-id='type-id-1664' is-artificial='yes'/>
             <parameter type-id='type-id-184'/>
             <parameter type-id='type-id-60'/>
             <return type-id='type-id-1'/>
@@ -16594,15 +16594,15 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Sequence7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT8Sequence14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16615,7 +16615,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT8Sequence5applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1661' is-artificial='yes'/>
+            <parameter type-id='type-id-1667' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16640,22 +16640,22 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1663' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -16692,7 +16692,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-531' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16739,7 +16739,7 @@
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-532' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16777,36 +16777,36 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
@@ -16819,8 +16819,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1669' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
@@ -16853,28 +16853,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat111would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat112get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16887,7 +16887,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat15applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16918,28 +16918,28 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT18SingleSubstFormat211would_applyEPNS_24hb_would_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT18SingleSubstFormat212get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <return type-id='type-id-943'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18SingleSubstFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -16952,7 +16952,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply' mangled-name='_ZNK2OT18SingleSubstFormat25applyEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='149' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -16968,35 +16968,35 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1676'>
+      <class-decl name='SortedArrayOf&lt;OT::IntType&lt;short unsigned int, 2u&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-702'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1679'>
+      <class-decl name='SortedArrayOf&lt;OT::RangeRecord, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1060'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_codepoint_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
             <parameter type-id='type-id-813'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -17005,22 +17005,22 @@
       <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Feature&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1875'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1062'/>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1682'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::LangSys&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1688'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1064'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1684' is-artificial='yes'/>
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-1741'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1685'>
+      <class-decl name='SortedArrayOf&lt;OT::Record&lt;OT::Script&gt;, OT::IntType&lt;short unsigned int, 2u&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='982' column='1' id='type-id-1691'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1066'/>
         <member-function access='public'>
           <function-decl name='bsearch&lt;hb_tag_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1687' is-artificial='yes'/>
-            <parameter type-id='type-id-1735'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <parameter type-id='type-id-1741'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -17029,35 +17029,35 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1182'/>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1276' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-379'/>
           </function-decl>
@@ -17070,9 +17070,9 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='would_apply' mangled-name='_ZNK2OT11SubstLookup11would_applyEPNS_24hb_would_apply_context_tEPK24hb_set_digest_combiner_tI27hb_set_digest_lowest_bits_tImLj4EES3_IS4_ImLj0EES4_ImLj9EEEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
-            <parameter type-id='type-id-1734'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
+            <parameter type-id='type-id-1740'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
@@ -17085,48 +17085,48 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='is_reverse' mangled-name='_ZNK2OT11SubstLookup10is_reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='apply_once' mangled-name='_ZNK2OT11SubstLookup10apply_onceEPNS_18hb_apply_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1206' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT11SubstLookup7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT11SubstLookup14collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1176' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_subtable' mangled-name='_ZNK2OT11SubstLookup12get_subtableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <return type-id='type-id-1691'/>
+            <return type-id='type-id-1697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='dispatch_recurse_func&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='dispatch_recurse_func&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZN2OT11SubstLookup21dispatch_recurse_funcINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
@@ -17140,8 +17140,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='add_coverage&lt;hb_set_digest_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1689' is-artificial='yes'/>
-            <parameter type-id='type-id-1738'/>
+            <parameter type-id='type-id-1695' is-artificial='yes'/>
+            <parameter type-id='type-id-1744'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -17224,7 +17224,7 @@
               <var-decl name='chainContext' type-id='type-id-1832' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1144' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='extension' type-id='type-id-1454' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
+              <var-decl name='extension' type-id='type-id-1460' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1145' column='1'/>
             </data-member>
             <data-member access='public'>
               <var-decl name='reverseChainContextSingle' type-id='type-id-1289' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1146' column='1'/>
@@ -17239,16 +17239,16 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_would_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_24hb_would_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <parameter type-id='type-id-1338'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1344'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-379'/>
           </function-decl>
@@ -17263,23 +17263,23 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_collect_glyphs_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_27hb_collect_glyphs_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <parameter type-id='type-id-1334'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1338'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_closure_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_20hb_closure_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <parameter type-id='type-id-1332'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1334'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_apply_context_t&gt;' mangled-name='_ZNK2OT19SubstLookupSubTable8dispatchINS_18hb_apply_context_tEEENT_8return_tEPS3_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
             <parameter type-id='type-id-1324'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-379'/>
@@ -17287,8 +17287,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::hb_get_coverage_context_t&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1692' is-artificial='yes'/>
-            <parameter type-id='type-id-1336'/>
+            <parameter type-id='type-id-1698' is-artificial='yes'/>
+            <parameter type-id='type-id-1342'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1818'/>
           </function-decl>
@@ -17321,25 +17321,25 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='has_device' mangled-name='_ZNK2OT11ValueFormat10has_deviceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='get_short' mangled-name='_ZN2OT11ValueFormat9get_shortEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698'/>
-            <return type-id='type-id-1655'/>
+            <parameter type-id='type-id-1704'/>
+            <return type-id='type-id-1661'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='get_device' mangled-name='_ZN2OT11ValueFormat10get_deviceEPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1698'/>
-            <return type-id='type-id-1566'/>
+            <parameter type-id='type-id-1704'/>
+            <return type-id='type-id-1572'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_size' mangled-name='_ZNK2OT11ValueFormat8get_sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
@@ -17373,7 +17373,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='get_len' mangled-name='_ZNK2OT11ValueFormat7get_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
             <return type-id='type-id-18'/>
           </function-decl>
         </member-function>
@@ -17390,11 +17390,11 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='apply_value' mangled-name='_ZNK2OT11ValueFormat11apply_valueEP9hb_font_t14hb_direction_tPKvPKNS_7IntTypeItLj2EEER19hb_glyph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1700' is-artificial='yes'/>
-            <parameter type-id='type-id-154'/>
+            <parameter type-id='type-id-1706' is-artificial='yes'/>
+            <parameter type-id='type-id-153'/>
             <parameter type-id='type-id-68'/>
             <parameter type-id='type-id-19'/>
-            <parameter type-id='type-id-1698'/>
+            <parameter type-id='type-id-1704'/>
             <parameter type-id='type-id-98'/>
             <return type-id='type-id-25'/>
           </function-decl>
@@ -17420,7 +17420,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <typedef-decl name='match_func_t' type-id='type-id-1342' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
+              <typedef-decl name='match_func_t' type-id='type-id-1346' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
               <var-decl name='lookup_props' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='384' column='1'/>
@@ -17494,16 +17494,16 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='may_match' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t9may_matchERK15hb_glyph_info_tPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
                 <parameter type-id='type-id-94'/>
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <return type-id='type-id-1886'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='may_skip' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t8may_skipEPKS0_RK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1704' is-artificial='yes'/>
-                <parameter type-id='type-id-1702'/>
+                <parameter type-id='type-id-1710' is-artificial='yes'/>
+                <parameter type-id='type-id-1708'/>
                 <parameter type-id='type-id-94'/>
                 <return type-id='type-id-1887'/>
               </function-decl>
@@ -17517,7 +17517,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1327'>
+          <class-decl name='skipping_backward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='465' column='1' id='type-id-1329'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='524' column='1'/>
             </data-member>
@@ -17528,14 +17528,14 @@
               <var-decl name='matcher' type-id='type-id-1325' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='527' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='528' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='530' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_backward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <parameter type-id='type-id-1324'/>
                 <parameter type-id='type-id-18'/>
                 <parameter type-id='type-id-18'/>
@@ -17545,42 +17545,42 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t28skipping_backward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='494' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1706' is-artificial='yes'/>
+                <parameter type-id='type-id-1712' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <parameter type-id='type-id-1837'/>
                 <parameter type-id='type-id-19'/>
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_lookup_props' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t16set_lookup_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='484' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <parameter type-id='type-id-18'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='reject' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t6rejectEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='495' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='prev' mangled-name='_ZN2OT18hb_apply_context_t28skipping_backward_iterator_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='496' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1328' is-artificial='yes'/>
+                <parameter type-id='type-id-1330' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1329'>
+          <class-decl name='skipping_forward_iterator_t' size-in-bits='512' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='394' column='1' id='type-id-1331'>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='idx' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='454' column='1'/>
             </data-member>
@@ -17591,7 +17591,7 @@
               <var-decl name='matcher' type-id='type-id-1325' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='457' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='384'>
-              <var-decl name='match_glyph_data' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
+              <var-decl name='match_glyph_data' type-id='type-id-1702' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='458' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='448'>
               <var-decl name='num_items' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='460' column='1'/>
@@ -17601,7 +17601,7 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <parameter type-id='type-id-1324'/>
                 <parameter type-id='type-id-18'/>
                 <parameter type-id='type-id-18'/>
@@ -17611,28 +17611,28 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='has_no_chance' mangled-name='_ZNK2OT18hb_apply_context_t27skipping_forward_iterator_t13has_no_chanceEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='424' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1708' is-artificial='yes'/>
+                <parameter type-id='type-id-1714' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_match_func' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t14set_match_funcEPFbjRKNS_7IntTypeItLj2EEEPKvES7_PS4_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='416' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <parameter type-id='type-id-1837'/>
                 <parameter type-id='type-id-19'/>
-                <parameter type-id='type-id-1696'/>
+                <parameter type-id='type-id-1702'/>
                 <return type-id='type-id-25'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='next' mangled-name='_ZN2OT18hb_apply_context_t27skipping_forward_iterator_t4nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='426' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='skipping_forward_iterator_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1330' is-artificial='yes'/>
+                <parameter type-id='type-id-1332' is-artificial='yes'/>
                 <parameter type-id='type-id-1888'/>
                 <parameter type-id='type-id-18'/>
                 <parameter type-id='type-id-18'/>
@@ -17643,7 +17643,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1740' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1328' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='264' column='1'/>
@@ -17652,13 +17652,13 @@
           <var-decl name='table_index' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='282' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
+          <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='face' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
+          <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='direction' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='286' column='1'/>
@@ -17679,7 +17679,7 @@
           <var-decl name='lookup_props' type-id='type-id-18' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='291' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
-          <var-decl name='gdef' type-id='type-id-1467' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
+          <var-decl name='gdef' type-id='type-id-1473' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='292' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
           <var-decl name='has_glyph_classes' type-id='type-id-1' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='293' column='1'/>
@@ -17691,154 +17691,154 @@
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1448'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1518'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1527'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1531'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1671'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1673'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1613'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1615'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='match_properties_mark' mangled-name='_ZNK2OT18hb_apply_context_t21match_properties_markEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-18'/>
@@ -17858,7 +17858,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='output_glyph_for_component' mangled-name='_ZNK2OT18hb_apply_context_t26output_glyph_for_componentEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-25'/>
@@ -17866,14 +17866,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='replace_glyph_inplace' mangled-name='_ZNK2OT18hb_apply_context_t21replace_glyph_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='replace_glyph_with_ligature' mangled-name='_ZNK2OT18hb_apply_context_t27replace_glyph_with_ligatureEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-25'/>
@@ -17888,7 +17888,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT18hb_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-379'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17916,7 +17916,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_set_glyph_props' mangled-name='_ZNK2OT18hb_apply_context_t16_set_glyph_propsEjjbb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <parameter type-id='type-id-18'/>
             <parameter type-id='type-id-1'/>
@@ -17926,15 +17926,15 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='replace_glyph' mangled-name='_ZNK2OT18hb_apply_context_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
             <parameter type-id='type-id-72'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='check_glyph_property' mangled-name='_ZNK2OT18hb_apply_context_t20check_glyph_propertyEPK15hb_glyph_info_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1702' is-artificial='yes'/>
-            <parameter type-id='type-id-1716'/>
+            <parameter type-id='type-id-1708' is-artificial='yes'/>
+            <parameter type-id='type-id-1722'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -17942,7 +17942,7 @@
         <member-function access='public'>
           <function-decl name='set_lookup' mangled-name='_ZN2OT18hb_apply_context_t10set_lookupERKNS_6LookupE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='316' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1324' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
+            <parameter type-id='type-id-1508'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -17950,8 +17950,8 @@
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1890' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -17959,8 +17959,8 @@
           <function-decl name='hb_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='297' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1888' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
-            <parameter type-id='type-id-154'/>
             <parameter type-id='type-id-153'/>
+            <parameter type-id='type-id-152'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
@@ -17972,9 +17972,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1331'>
+      <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1333'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1742' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1336' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='return_t' type-id='type-id-995' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='59' column='1' id='type-id-1819'/>
@@ -17999,7 +17999,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_closure_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-18'/>
@@ -18008,91 +18008,91 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT20hb_closure_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <return type-id='type-id-17'/>
           </function-decl>
         </member-function>
@@ -18103,29 +18103,29 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='recurse' mangled-name='_ZN2OT20hb_closure_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT20hb_closure_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1710' is-artificial='yes'/>
+            <parameter type-id='type-id-1716' is-artificial='yes'/>
             <parameter type-id='type-id-1819'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT20hb_closure_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1332' is-artificial='yes'/>
+            <parameter type-id='type-id-1334' is-artificial='yes'/>
             <parameter type-id='type-id-1891'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1333'>
+      <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1337'>
         <member-type access='public'>
-          <typedef-decl name='recurse_func_t' type-id='type-id-1744' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
+          <typedef-decl name='recurse_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='146' column='1'/>
@@ -18159,7 +18159,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-964'/>
@@ -18171,154 +18171,154 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~hb_collect_glyphs_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-11' is-artificial='yes'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1671'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1673'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1448'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1518'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1527'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1531'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1613'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1615'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT27hb_collect_glyphs_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <return type-id='type-id-17'/>
           </function-decl>
         </member-function>
@@ -18329,27 +18329,27 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='recurse' mangled-name='_ZN2OT27hb_collect_glyphs_context_t7recurseEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-18'/>
             <return type-id='type-id-1819'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT27hb_collect_glyphs_context_t24stop_sublookup_iterationERK10_hb_void_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <parameter type-id='type-id-1718' is-artificial='yes'/>
             <parameter type-id='type-id-1819'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_recurse_func' mangled-name='_ZN2OT27hb_collect_glyphs_context_t16set_recurse_funcEPFRK10_hb_void_tPS0_jE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1334' is-artificial='yes'/>
+            <parameter type-id='type-id-1338' is-artificial='yes'/>
             <parameter type-id='type-id-1892'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1335'>
+      <class-decl name='hb_get_coverage_context_t' size-in-bits='32' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='236' column='1' id='type-id-1341'>
         <member-type access='public'>
           <typedef-decl name='return_t' type-id='type-id-943' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='239' column='1' id='type-id-1818'/>
         </member-type>
@@ -18361,153 +18361,153 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1665'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1671'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SinglePosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1667'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1673'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1613'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::PairPosFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1609'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1615'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::CursivePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1448'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkBasePosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1518'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkLigPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1527'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MarkMarkPosFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1525'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1531'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT25hb_get_coverage_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-17'/>
           </function-decl>
         </member-function>
@@ -18518,96 +18518,96 @@
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_get_coverage_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
             <return type-id='type-id-25'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1336' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1342' is-artificial='yes'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-1818'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1337'>
+      <class-decl name='hb_would_apply_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='106' column='1' id='type-id-1343'>
         <data-member access='public' static='yes'>
           <var-decl name='max_debug_depth' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='108' column='1'/>
         </data-member>
@@ -18628,7 +18628,7 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='hb_would_apply_context_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <parameter type-id='type-id-160'/>
             <parameter type-id='type-id-95'/>
             <parameter type-id='type-id-18'/>
@@ -18638,91 +18638,91 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1671'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::SingleSubstFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1674'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::MultipleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1531'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1537'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::AlternateSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1349'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1355'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ReverseChainSingleSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1652'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::LigatureSubstFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1499'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1505'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1424'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1430'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1427'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1433'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1430'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1436'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat1&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1407'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat2&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1404'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1410'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='dispatch&lt;OT::ChainContextFormat3&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-1407'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
+            <parameter type-id='type-id-1413'/>
             <return type-id='type-id-379'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_name' mangled-name='_ZN2OT24hb_would_apply_context_t8get_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
+            <parameter type-id='type-id-1344' is-artificial='yes'/>
             <return type-id='type-id-17'/>
           </function-decl>
         </member-function>
@@ -18733,7 +18733,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='stop_sublookup_iteration' mangled-name='_ZNK2OT24hb_would_apply_context_t24stop_sublookup_iterationEb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <parameter type-id='type-id-1720' is-artificial='yes'/>
             <parameter type-id='type-id-379'/>
             <return type-id='type-id-1'/>
           </function-decl>
@@ -18742,7 +18742,7 @@
       <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
       <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1871'/>
       <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1747' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1839'/>
-      <typedef-decl name='intersects_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
+      <typedef-decl name='intersects_func_t' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
       <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'/>
       <class-decl name='Supplier&lt;OT::Index&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1750'/>
       <class-decl name='Supplier&lt;OT::IntType&lt;unsigned int, 3u&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1752'/>
@@ -18834,7 +18834,7 @@
       <return type-id='type-id-18'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_ligature_carets' mangled-name='hb_ot_layout_get_ligature_carets' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_ligature_carets'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
       <parameter type-id='type-id-68' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
       <parameter type-id='type-id-72' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
       <parameter type-id='type-id-18' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='160' column='1'/>
@@ -18860,7 +18860,7 @@
     <function-decl name='hb_ot_layout_table_choose_script' mangled-name='hb_ot_layout_table_choose_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_choose_script'>
       <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
-      <parameter type-id='type-id-1736' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
+      <parameter type-id='type-id-1742' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <parameter type-id='type-id-60' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
       <parameter type-id='type-id-970' name='chosen_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='233' column='1'/>
       <return type-id='type-id-40'/>
@@ -18953,9 +18953,9 @@
     <function-decl name='hb_ot_layout_collect_lookups' mangled-name='hb_ot_layout_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_collect_lookups'>
       <parameter type-id='type-id-160' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
       <parameter type-id='type-id-184' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
-      <parameter type-id='type-id-1736' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
-      <parameter type-id='type-id-1736' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
-      <parameter type-id='type-id-1736' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
+      <parameter type-id='type-id-1742' name='scripts' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='596' column='1'/>
+      <parameter type-id='type-id-1742' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
+      <parameter type-id='type-id-1742' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='598' column='1'/>
       <parameter type-id='type-id-964' name='lookup_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='599' column='1'/>
       <return type-id='type-id-25'/>
     </function-decl>
@@ -19000,42 +19000,42 @@
       <parameter type-id='type-id-60' name='range_end' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='757' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-1739'>
+    <function-type size-in-bits='64' id='type-id-1327'>
       <parameter type-id='type-id-1324'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-379'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1339'>
+    <function-type size-in-bits='64' id='type-id-1347'>
       <parameter type-id='type-id-964'/>
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1341'>
+    <function-type size-in-bits='64' id='type-id-1345'>
       <parameter type-id='type-id-72'/>
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1741'>
-      <parameter type-id='type-id-1332'/>
+    <function-type size-in-bits='64' id='type-id-1335'>
+      <parameter type-id='type-id-1334'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-1819'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1743'>
-      <parameter type-id='type-id-1334'/>
+    <function-type size-in-bits='64' id='type-id-1339'>
+      <parameter type-id='type-id-1338'/>
       <parameter type-id='type-id-18'/>
       <return type-id='type-id-1819'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1745'>
       <parameter type-id='type-id-962'/>
-      <parameter type-id='type-id-154'/>
       <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-152'/>
       <return type-id='type-id-25'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1746'>
       <parameter type-id='type-id-964'/>
-      <parameter type-id='type-id-1695'/>
+      <parameter type-id='type-id-1701'/>
       <parameter type-id='type-id-19'/>
       <return type-id='type-id-25'/>
     </function-type>
@@ -19339,10 +19339,10 @@
     <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-571'/>
     <reference-type-def kind='lvalue' type-id='type-id-1313' size-in-bits='64' id='type-id-557'/>
     <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-561'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1676' size-in-bits='64' id='type-id-551'/>
-    <pointer-type-def type-id='type-id-1676' size-in-bits='64' id='type-id-549'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1679' size-in-bits='64' id='type-id-555'/>
-    <pointer-type-def type-id='type-id-1679' size-in-bits='64' id='type-id-553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1682' size-in-bits='64' id='type-id-551'/>
+    <pointer-type-def type-id='type-id-1682' size-in-bits='64' id='type-id-549'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1685' size-in-bits='64' id='type-id-555'/>
+    <pointer-type-def type-id='type-id-1685' size-in-bits='64' id='type-id-553'/>
     <qualified-type-def type-id='type-id-542' const='yes' id='type-id-1924'/>
     <reference-type-def kind='lvalue' type-id='type-id-1924' size-in-bits='64' id='type-id-952'/>
     <pointer-type-def type-id='type-id-744' size-in-bits='64' id='type-id-848'/>
@@ -19606,7 +19606,7 @@
       <member-function access='public'>
         <function-decl name='get_virama_glyph' mangled-name='_ZNK18indic_shape_plan_t16get_virama_glyphEP9hb_font_tPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='510' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1999' is-artificial='yes'/>
-          <parameter type-id='type-id-154'/>
+          <parameter type-id='type-id-153'/>
           <parameter type-id='type-id-119'/>
           <return type-id='type-id-1'/>
         </function-decl>
@@ -19736,10 +19736,10 @@
         <var-decl name='plan' type-id='type-id-962' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='buffer' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
+        <var-decl name='buffer' type-id='type-id-152' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='font' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
+        <var-decl name='font' type-id='type-id-153' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
@@ -19751,7 +19751,7 @@
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1723'>
+    <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1729'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='props' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
@@ -19799,16 +19799,16 @@
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-962' is-artificial='yes'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-962' is-artificial='yes'/>
-          <parameter type-id='type-id-154'/>
           <parameter type-id='type-id-153'/>
+          <parameter type-id='type-id-152'/>
           <return type-id='type-id-25'/>
         </function-decl>
       </member-function>
@@ -19871,8 +19871,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-2033' size-in-bits='64' id='type-id-2026'/>
     <qualified-type-def type-id='type-id-236' const='yes' id='type-id-2034'/>
     <pointer-type-def type-id='type-id-2034' size-in-bits='64' id='type-id-2025'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1723' size-in-bits='64' id='type-id-2027'/>
-    <pointer-type-def type-id='type-id-1723' size-in-bits='64' id='type-id-1816'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1729' size-in-bits='64' id='type-id-2027'/>
+    <pointer-type-def type-id='type-id-1729' size-in-bits='64' id='type-id-1816'/>
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2035'/>
     <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
     <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2019'/>
@@ -19885,8 +19885,8 @@
       <return type-id='type-id-25'/>
     </function-decl>
     <function-decl name='hb_ot_shape_glyphs_closure' mangled-name='hb_ot_shape_glyphs_closure' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_glyphs_closure'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <parameter type-id='type-id-18' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='773' column='1'/>
       <parameter type-id='type-id-964' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
@@ -19908,8 +19908,8 @@
     </function-type>
     <function-type size-in-bits='64' id='type-id-2036'>
       <parameter type-id='type-id-962'/>
+      <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-154'/>
       <return type-id='type-id-25'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-2037'>
@@ -20316,8 +20316,8 @@
     </function-decl>
     <function-decl name='hb_shape_plan_execute' mangled-name='hb_shape_plan_execute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_execute'>
       <parameter type-id='type-id-194' name='shape_plan' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1'/>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='286' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='287' column='1'/>
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='288' column='1'/>
       <parameter type-id='type-id-18' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='289' column='1'/>
       <return type-id='type-id-40'/>
@@ -20354,16 +20354,16 @@
       <return type-id='type-id-142'/>
     </function-decl>
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <parameter type-id='type-id-18' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='350' column='1'/>
       <parameter type-id='type-id-2048' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
-      <parameter type-id='type-id-154' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
-      <parameter type-id='type-id-153' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
+      <parameter type-id='type-id-153' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
+      <parameter type-id='type-id-152' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <parameter type-id='type-id-350' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <parameter type-id='type-id-18' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='382' column='1'/>
       <return type-id='type-id-25'/>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 6b4789fc..31ea116e 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -5013,92 +5013,92 @@
     <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-638'/>
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-191'/>
     <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-641'/>
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
-    <pointer-type-def type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
-    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-645'/>
-    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-648'/>
-    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-649'/>
-    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
-    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-652'/>
-    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-653'/>
-    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
-    <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-657'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-659'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
-    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-661'/>
-    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
-    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-663'/>
-    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-665'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
-    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-667'/>
-    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
-    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-669'/>
-    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
-    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-671'/>
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
-    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-673'/>
-    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
-    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-675'/>
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
-    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-677'/>
-    <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-680'/>
-    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
-    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-683'/>
-    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-686'/>
-    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
-    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-688'/>
-    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
-    <pointer-type-def type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
-    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-692'/>
-    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-695'/>
-    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
-    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-697'/>
-    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
-    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-699'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-701'/>
-    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
-    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-212'/>
+    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
+    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-643'/>
+    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-502' size-in-bits='64' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-651'/>
+    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
+    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-654'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-655'/>
+    <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-658'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-659'/>
+    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-521' size-in-bits='64' id='type-id-662'/>
+    <pointer-type-def type-id='type-id-521' size-in-bits='64' id='type-id-663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-525' size-in-bits='64' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-525' size-in-bits='64' id='type-id-665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-668'/>
+    <pointer-type-def type-id='type-id-536' size-in-bits='64' id='type-id-669'/>
+    <reference-type-def kind='lvalue' type-id='type-id-540' size-in-bits='64' id='type-id-670'/>
+    <pointer-type-def type-id='type-id-540' size-in-bits='64' id='type-id-671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-672'/>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-548' size-in-bits='64' id='type-id-674'/>
+    <pointer-type-def type-id='type-id-548' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-552' size-in-bits='64' id='type-id-676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-676' size-in-bits='64' id='type-id-677'/>
+    <pointer-type-def type-id='type-id-564' size-in-bits='64' id='type-id-678'/>
+    <pointer-type-def type-id='type-id-679' size-in-bits='64' id='type-id-680'/>
+    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-681'/>
+    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-683'/>
+    <pointer-type-def type-id='type-id-570' size-in-bits='64' id='type-id-684'/>
+    <pointer-type-def type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
+    <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-687'/>
+    <pointer-type-def type-id='type-id-573' size-in-bits='64' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-576' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-576' size-in-bits='64' id='type-id-690'/>
+    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-696'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-375' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-379' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-704'/>
     <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-705'/>
     <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-358'/>
-    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-706'/>
     <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-706'/>
-    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-707'/>
-    <pointer-type-def type-id='type-id-708' size-in-bits='64' id='type-id-709'/>
-    <pointer-type-def type-id='type-id-710' size-in-bits='64' id='type-id-711'/>
-    <pointer-type-def type-id='type-id-712' size-in-bits='64' id='type-id-713'/>
-    <pointer-type-def type-id='type-id-714' size-in-bits='64' id='type-id-715'/>
-    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-717'/>
-    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-718'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-720'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
-    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-722'/>
+    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-707'/>
+    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-708'/>
+    <pointer-type-def type-id='type-id-709' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-711' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-714'/>
+    <pointer-type-def type-id='type-id-715' size-in-bits='64' id='type-id-716'/>
+    <pointer-type-def type-id='type-id-717' size-in-bits='64' id='type-id-718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-721'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-723'/>
     <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-222'/>
-    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-723'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
-    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-212'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-724'/>
+    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-725'/>
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-726'/>
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-333'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-727'/>
-    <reference-type-def kind='lvalue' type-id='type-id-727' size-in-bits='64' id='type-id-728'/>
-    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-729'/>
-    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-730'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
-    <qualified-type-def type-id='type-id-731' const='yes' id='type-id-732'/>
-    <reference-type-def kind='lvalue' type-id='type-id-732' size-in-bits='64' id='type-id-733'/>
-    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-728'/>
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
+    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
+    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-732'/>
+    <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-197'/>
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-198'/>
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-388'/>
@@ -5131,7 +5131,7 @@
     <namespace-decl name='std'>
       <class-decl name='_Rb_tree&lt;long unsigned int, long unsigned int, std::_Identity&lt;long unsigned int&gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;long unsigned int, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-498'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-643'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-644'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-335'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_key_compare' type-id='type-id-593' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
@@ -5144,13 +5144,13 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <parameter type-id='type-id-595'/>
                 <parameter type-id='type-id-332'/>
                 <return type-id='type-id-75'/>
@@ -5158,24 +5158,24 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS3_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-644' is-artificial='yes'/>
+                <parameter type-id='type-id-645' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-643' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-644' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-331'/>
             <return type-id='type-id-75'/>
@@ -5183,14 +5183,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-500'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -5215,31 +5215,31 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeImESB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-337'/>
             <parameter type-id='type-id-337'/>
             <parameter type-id='type-id-334'/>
@@ -5248,7 +5248,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-536'/>
           </function-decl>
@@ -5273,21 +5273,21 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-337'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-337'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
@@ -5299,34 +5299,34 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-337'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <return type-id='type-id-536'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
-            <return type-id='type-id-710'/>
+            <return type-id='type-id-711'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeImE'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-337'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImmSt9_IdentityImESt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSB_RKm'>
-            <parameter type-id='type-id-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-334'/>
@@ -5336,7 +5336,7 @@
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-502'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-647'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-648'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-338'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_key_compare' type-id='type-id-593' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
@@ -5349,13 +5349,13 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <parameter type-id='type-id-595'/>
                 <parameter type-id='type-id-340'/>
                 <return type-id='type-id-75'/>
@@ -5363,24 +5363,24 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE13_Rb_tree_implIS8_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-648' is-artificial='yes'/>
+                <parameter type-id='type-id-649' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-647' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-648' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-352'/>
             <return type-id='type-id-75'/>
@@ -5388,21 +5388,21 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-504'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
@@ -5420,31 +5420,31 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <parameter type-id='type-id-341'/>
             <parameter type-id='type-id-334'/>
@@ -5453,7 +5453,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-540'/>
           </function-decl>
@@ -5466,7 +5466,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS4_ESF_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <parameter type-id='type-id-341'/>
             <parameter type-id='type-id-334'/>
@@ -5481,7 +5481,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-540'/>
           </function-decl>
@@ -5494,7 +5494,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
@@ -5506,48 +5506,48 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE14_M_create_nodeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
             <return type-id='type-id-341'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE16_M_insert_uniqueERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS4_E'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmN15HeapLeakChecker10RangeValueEESt10_Select1stIS4_ESt4lessImE13STL_AllocatorIS4_NS2_9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSF_RKS4_'>
-            <parameter type-id='type-id-646' is-artificial='yes'/>
+            <parameter type-id='type-id-647' is-artificial='yes'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-354'/>
@@ -5557,7 +5557,7 @@
       </class-decl>
       <class-decl name='_Rb_tree&lt;long unsigned int, std::pair&lt;const long unsigned int, long unsigned int&gt;, std::_Select1st&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, std::less&lt;long unsigned int&gt;, STL_Allocator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-506'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-651'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;long unsigned int&gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-652'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-342'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_key_compare' type-id='type-id-593' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
@@ -5570,13 +5570,13 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <parameter type-id='type-id-595'/>
                 <parameter type-id='type-id-344'/>
                 <return type-id='type-id-75'/>
@@ -5584,24 +5584,24 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE13_Rb_tree_implIS6_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-652' is-artificial='yes'/>
+                <parameter type-id='type-id-653' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-651' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-652' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-75'/>
@@ -5609,27 +5609,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-508'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
@@ -5647,31 +5647,31 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_upper_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1013' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <parameter type-id='type-id-345'/>
             <parameter type-id='type-id-334'/>
@@ -5680,7 +5680,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11upper_boundERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-544'/>
           </function-decl>
@@ -5693,7 +5693,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_lower_boundEPSt13_Rb_tree_nodeIS2_ESE_RS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <parameter type-id='type-id-345'/>
             <parameter type-id='type-id-334'/>
@@ -5708,7 +5708,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE4findERS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1418' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-544'/>
           </function-decl>
@@ -5727,55 +5727,55 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_put_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE14_M_create_nodeERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-359'/>
             <return type-id='type-id-345'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE16_M_insert_uniqueERKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-359'/>
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1341' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-544'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE8_M_eraseEPSt13_Rb_tree_nodeIS2_E'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeImSt4pairIKmmESt10_Select1stIS2_ESt4lessImE13STL_AllocatorIS2_N15HeapLeakChecker9AllocatorEEE10_M_insert_EPKSt18_Rb_tree_node_baseSE_RKS2_'>
-            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-651' is-artificial='yes'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-359'/>
@@ -5785,7 +5785,7 @@
       </class-decl>
       <class-decl name='_Rb_tree&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, std::_Select1st&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, STL_Allocator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='384' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='323' column='1' id='type-id-510'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-655'>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt; &gt;, false&gt;' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='427' column='1' id='type-id-656'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-346'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_key_compare' type-id='type-id-597' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='428' column='1'/>
@@ -5798,13 +5798,13 @@
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <parameter type-id='type-id-599'/>
                 <parameter type-id='type-id-348'/>
                 <return type-id='type-id-75'/>
@@ -5812,24 +5812,24 @@
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE13_Rb_tree_implISH_Lb0EE13_M_initializeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='444' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-656' is-artificial='yes'/>
+                <parameter type-id='type-id-657' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-655' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-656' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='453' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='591' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='593' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-599'/>
             <parameter type-id='type-id-362'/>
             <return type-id='type-id-75'/>
@@ -5837,27 +5837,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-512'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='613' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
@@ -5893,39 +5893,39 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_put_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-349'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-349'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE15_M_destroy_nodeEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='381' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-349'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_get_nodeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-349'/>
           </function-decl>
         </member-function>
@@ -5937,13 +5937,13 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE6_M_endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='492' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <return type-id='type-id-349'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_lower_boundEPSt13_Rb_tree_nodeISD_ESM_RS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <parameter type-id='type-id-349'/>
             <parameter type-id='type-id-578'/>
@@ -5952,7 +5952,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11lower_boundERS8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='744' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
             <return type-id='type-id-548'/>
           </function-decl>
@@ -5965,7 +5965,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE14_M_create_nodeERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-364'/>
             <return type-id='type-id-349'/>
           </function-decl>
@@ -5978,14 +5978,14 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -5996,14 +5996,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE8_M_eraseEPSt13_Rb_tree_nodeISD_E'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE10_M_insert_EPKSt18_Rb_tree_node_baseSM_RKSD_'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-554'/>
             <parameter type-id='type-id-364'/>
@@ -6012,14 +6012,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE16_M_insert_uniqueERKSD_'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-364'/>
-            <return type-id='type-id-716'/>
+            <return type-id='type-id-717'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_insert_unique_' mangled-name='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='1206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8_Rb_treeISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt4pairIKS6_St6vectorI11AllocObjectS2_ISA_S4_EEESt10_Select1stISD_ESt4lessIS6_ES2_ISD_S4_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorISD_ERKSD_'>
-            <parameter type-id='type-id-654' is-artificial='yes'/>
+            <parameter type-id='type-id-655' is-artificial='yes'/>
             <parameter type-id='type-id-529'/>
             <parameter type-id='type-id-364'/>
             <return type-id='type-id-548'/>
@@ -6030,20 +6030,20 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-422'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <parameter type-id='type-id-575'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-687' is-artificial='yes'/>
+            <parameter type-id='type-id-688' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6051,14 +6051,14 @@
       </class-decl>
       <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='105' column='1' id='type-id-576'>
         <member-type access='private'>
-          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-690'>
+          <class-decl name='_Alloc_hider' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='258' column='1' id='type-id-691'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-325'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_p' type-id='type-id-3' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='262' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Alloc_hider' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-691' is-artificial='yes'/>
+                <parameter type-id='type-id-692' is-artificial='yes'/>
                 <parameter type-id='type-id-3'/>
                 <parameter type-id='type-id-327'/>
                 <return type-id='type-id-75'/>
@@ -6080,31 +6080,31 @@
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <return type-id='type-id-692'/>
+                <return type-id='type-id-693'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_set_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep15_M_set_sharableEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_refdata' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <return type-id='type-id-3'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_dispose' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_disposeERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <parameter type-id='type-id-327'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_set_length_and_sharable' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep26_M_set_length_and_sharableEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <parameter type-id='type-id-19'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -6117,13 +6117,13 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_refcopy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_refcopyEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <return type-id='type-id-3'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_clone' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep8_M_cloneERKS4_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <parameter type-id='type-id-327'/>
                 <parameter type-id='type-id-19'/>
                 <return type-id='type-id-3'/>
@@ -6131,7 +6131,7 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_grab' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep7_M_grabERKS4_S8_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <parameter type-id='type-id-327'/>
                 <parameter type-id='type-id-327'/>
                 <return type-id='type-id-3'/>
@@ -6139,7 +6139,7 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_destroy' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE4_Rep10_M_destroyERKS4_'>
-                <parameter type-id='type-id-693' is-artificial='yes'/>
+                <parameter type-id='type-id-694' is-artificial='yes'/>
                 <parameter type-id='type-id-327'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -6149,7 +6149,7 @@
                 <parameter type-id='type-id-19'/>
                 <parameter type-id='type-id-19'/>
                 <parameter type-id='type-id-327'/>
-                <return type-id='type-id-693'/>
+                <return type-id='type-id-694'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -6161,31 +6161,31 @@
           <var-decl name='npos' type-id='type-id-115' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='270' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_dataplus' type-id='type-id-690' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
+          <var-decl name='_M_dataplus' type-id='type-id-691' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='274' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='2144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-327'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC1ERKS5_'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-19'/>
@@ -6194,7 +6194,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-19'/>
@@ -6204,7 +6204,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-327'/>
@@ -6213,7 +6213,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEEC2EPKcRKS4_'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-2'/>
             <parameter type-id='type-id-327'/>
             <return type-id='type-id-75'/>
@@ -6221,7 +6221,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_string' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.tcc' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-84'/>
             <parameter type-id='type-id-327'/>
@@ -6230,7 +6230,7 @@
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~basic_string' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEED1Ev'>
-            <parameter type-id='type-id-689' is-artificial='yes'/>
+            <parameter type-id='type-id-690' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6270,7 +6270,7 @@
         <member-function access='private'>
           <function-decl name='_M_rep' mangled-name='_ZNKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE6_M_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-579' is-artificial='yes'/>
-            <return type-id='type-id-693'/>
+            <return type-id='type-id-694'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -6295,7 +6295,7 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_empty_rep' mangled-name='_ZNSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEE12_S_empty_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-692'/>
+            <return type-id='type-id-693'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -6342,13 +6342,13 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-352'/>
             <return type-id='type-id-75'/>
@@ -6356,35 +6356,35 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-602'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE6insertERKS7_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-354'/>
-            <return type-id='type-id-712'/>
+            <return type-id='type-id-713'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE4findERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE11upper_boundERS6_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt3mapImN15HeapLeakChecker10RangeValueESt4lessImE13STL_AllocatorISt4pairIKmS1_ENS0_9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <return type-id='type-id-540'/>
           </function-decl>
         </member-function>
@@ -6398,13 +6398,13 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-357'/>
             <return type-id='type-id-75'/>
@@ -6412,49 +6412,49 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-605'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE4findERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5eraseESt17_Rb_tree_iteratorIS5_E' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='566' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-544'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE11upper_boundERS4_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-544'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3mapImmSt4lessImE13STL_AllocatorISt4pairIKmmEN15HeapLeakChecker9AllocatorEEE6insertERKS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-359'/>
-            <return type-id='type-id-714'/>
+            <return type-id='type-id-715'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6467,13 +6467,13 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-599'/>
             <parameter type-id='type-id-362'/>
             <return type-id='type-id-75'/>
@@ -6481,26 +6481,26 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='map' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-608'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <return type-id='type-id-548'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE11lower_boundERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
             <return type-id='type-id-548'/>
           </function-decl>
@@ -6513,7 +6513,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EE6insertESt17_Rb_tree_iteratorISF_ERKSF_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='539' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-548'/>
             <parameter type-id='type-id-364'/>
             <return type-id='type-id-548'/>
@@ -6521,9 +6521,9 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt3mapISbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS2_IS8_S4_EESt4lessIS6_ES2_ISt4pairIKS6_SA_ES4_EEixERSE_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_map.h' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-578'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6533,13 +6533,13 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-595'/>
             <parameter type-id='type-id-331'/>
             <return type-id='type-id-75'/>
@@ -6547,14 +6547,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='set' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-626'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE11lower_boundERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-517'/>
           </function-decl>
@@ -6567,9 +6567,9 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='insert' mangled-name='_ZNSt3setImSt4lessImE13STL_AllocatorImN15HeapLeakChecker9AllocatorEEE6insertERKm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_set.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
-            <return type-id='type-id-708'/>
+            <return type-id='type-id-709'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6577,20 +6577,20 @@
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-564'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-324'/>
             <parameter type-id='type-id-321'/>
@@ -6599,27 +6599,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-629'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-410'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE15_M_erase_at_endEPS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='1148' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-322'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6658,19 +6658,19 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-410'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-394'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE8pop_backEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
@@ -6682,27 +6682,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5eraseEN9__gnu_cxx17__normal_iteratorIPS0_S5_EE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-410'/>
             <return type-id='type-id-410'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE4swapERS5_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5clearEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='950' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-410'/>
             <parameter type-id='type-id-324'/>
             <return type-id='type-id-75'/>
@@ -6710,7 +6710,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-721' is-artificial='yes'/>
+            <parameter type-id='type-id-722' is-artificial='yes'/>
             <parameter type-id='type-id-324'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6735,7 +6735,7 @@
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-575'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6758,7 +6758,7 @@
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPFvvESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-730'/>
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -6796,7 +6796,7 @@
         <member-function access='private'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-222' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-729'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
@@ -6804,7 +6804,7 @@
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <parameter type-id='type-id-416'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-729'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
@@ -6813,20 +6813,20 @@
         <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-570'/>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-367'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-369'/>
             <parameter type-id='type-id-367'/>
@@ -6835,14 +6835,14 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-637'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6869,33 +6869,33 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE5beginEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <return type-id='type-id-419'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE3endEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <return type-id='type-id-419'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE9push_backERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-369'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-742'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S5_EERKS0_'>
-            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-725' is-artificial='yes'/>
             <parameter type-id='type-id-419'/>
             <parameter type-id='type-id-369'/>
             <return type-id='type-id-75'/>
@@ -6924,20 +6924,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <parameter type-id='type-id-748'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <parameter type-id='type-id-535'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6950,8 +6950,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorIN15MemoryRegionMap6RegionEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
-            <return type-id='type-id-657'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <return type-id='type-id-658'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -6963,20 +6963,20 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <parameter type-id='type-id-776'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-658' is-artificial='yes'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
             <parameter type-id='type-id-535'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -6994,20 +6994,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <parameter type-id='type-id-752'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <parameter type-id='type-id-538'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7032,20 +7032,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <parameter type-id='type-id-756'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-662' is-artificial='yes'/>
+            <parameter type-id='type-id-663' is-artificial='yes'/>
             <parameter type-id='type-id-542'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7070,20 +7070,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <parameter type-id='type-id-760'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <parameter type-id='type-id-546'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7096,8 +7096,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKmmEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
-            <return type-id='type-id-663'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <return type-id='type-id-664'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7114,34 +7114,34 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <parameter type-id='type-id-764'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
             <parameter type-id='type-id-550'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-666' is-artificial='yes'/>
-            <return type-id='type-id-665'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-666' is-artificial='yes'/>
-            <return type-id='type-id-665'/>
+            <parameter type-id='type-id-667' is-artificial='yes'/>
+            <return type-id='type-id-666'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7151,13 +7151,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-668' is-artificial='yes'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
             <parameter type-id='type-id-337'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7171,8 +7171,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorImEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-668' is-artificial='yes'/>
-            <return type-id='type-id-667'/>
+            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <return type-id='type-id-668'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7182,13 +7182,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
             <parameter type-id='type-id-341'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7202,8 +7202,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmN15HeapLeakChecker10RangeValueEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
-            <return type-id='type-id-669'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <return type-id='type-id-670'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7219,13 +7219,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-672' is-artificial='yes'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
             <parameter type-id='type-id-345'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7239,8 +7239,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKmmEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-672' is-artificial='yes'/>
-            <return type-id='type-id-671'/>
+            <parameter type-id='type-id-673' is-artificial='yes'/>
+            <return type-id='type-id-672'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7263,13 +7263,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-674' is-artificial='yes'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
             <parameter type-id='type-id-349'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7282,8 +7282,8 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEppEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-674' is-artificial='yes'/>
-            <return type-id='type-id-673'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7302,20 +7302,20 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEmmEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-674' is-artificial='yes'/>
-            <return type-id='type-id-673'/>
+            <parameter type-id='type-id-675' is-artificial='yes'/>
+            <return type-id='type-id-674'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt17_Rb_tree_iteratorISt4pairIKSbIcSt11char_traitsIcE13STL_AllocatorIcN15HeapLeakChecker9AllocatorEEESt6vectorI11AllocObjectS3_ISA_S5_EEEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-551' is-artificial='yes'/>
-            <return type-id='type-id-705'/>
+            <return type-id='type-id-706'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Rb_tree_node_base' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='88' column='1' id='type-id-552'>
         <member-type access='public'>
-          <typedef-decl name='_Base_ptr' type-id='type-id-675' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-676' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='89' column='1' id='type-id-777'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='_Const_Base_ptr' type-id='type-id-554' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='90' column='1' id='type-id-775'/>
@@ -7365,7 +7365,7 @@
       </class-decl>
       <class-decl name='_Vector_base&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-564'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-678'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-679'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-319'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-322' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -7378,13 +7378,13 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680' is-artificial='yes'/>
                 <parameter type-id='type-id-321'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -7392,24 +7392,24 @@
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-678' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-679' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <parameter type-id='type-id-321'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-321'/>
             <return type-id='type-id-75'/>
@@ -7417,14 +7417,14 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <return type-id='type-id-403'/>
           </function-decl>
         </member-function>
@@ -7436,14 +7436,14 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-322'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseI11AllocObject13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-677' is-artificial='yes'/>
+            <parameter type-id='type-id-678' is-artificial='yes'/>
             <parameter type-id='type-id-322'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-75'/>
@@ -7452,26 +7452,26 @@
       </class-decl>
       <class-decl name='_Vector_base&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-567'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-681'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-682'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-573'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-682' is-artificial='yes'/>
+                <parameter type-id='type-id-683' is-artificial='yes'/>
                 <parameter type-id='type-id-575'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -7479,24 +7479,24 @@
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-681' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-682' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <parameter type-id='type-id-575'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-575'/>
             <return type-id='type-id-75'/>
@@ -7504,7 +7504,7 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7517,29 +7517,29 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
-            <return type-id='type-id-686'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
+            <return type-id='type-id-687'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-680' is-artificial='yes'/>
+            <parameter type-id='type-id-681' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
-            <return type-id='type-id-731'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Vector_base&lt;void*, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='70' column='1' id='type-id-570'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-684'>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='75' column='1' id='type-id-685'>
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-365'/>
             <data-member access='public' layout-offset-in-bits='0'>
               <var-decl name='_M_start' type-id='type-id-174' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
@@ -7552,13 +7552,13 @@
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <return type-id='type-id-75'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-685' is-artificial='yes'/>
+                <parameter type-id='type-id-686' is-artificial='yes'/>
                 <parameter type-id='type-id-367'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -7566,24 +7566,24 @@
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-684' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-685' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='136' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <parameter type-id='type-id-367'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-367'/>
             <return type-id='type-id-75'/>
@@ -7591,7 +7591,7 @@
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <parameter type-id='type-id-1' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7604,7 +7604,7 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE13_M_deallocateEPS0_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <parameter type-id='type-id-174'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-75'/>
@@ -7612,13 +7612,13 @@
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE19_M_get_Tp_allocatorEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <return type-id='type-id-408'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPv13STL_AllocatorIS0_N15HeapLeakChecker9AllocatorEEE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-683' is-artificial='yes'/>
+            <parameter type-id='type-id-684' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-174'/>
           </function-decl>
@@ -7683,8 +7683,8 @@
       <class-decl name='__miter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-788'>
         <member-function access='public' static='yes'>
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731'/>
-            <return type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7715,8 +7715,8 @@
       <class-decl name='__niter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-792'>
         <member-function access='public' static='yes'>
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731'/>
-            <return type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7744,7 +7744,7 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-695'/>
+            <parameter type-id='type-id-696'/>
             <parameter type-id='type-id-588'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -7757,10 +7757,10 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/char_traits.h' line='274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-696'/>
+            <parameter type-id='type-id-697'/>
             <parameter type-id='type-id-589'/>
             <parameter type-id='type-id-7'/>
-            <return type-id='type-id-696'/>
+            <return type-id='type-id-697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -7887,13 +7887,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <parameter type-id='type-id-436'/>
             <return type-id='type-id-75'/>
@@ -7909,20 +7909,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-334'/>
             <parameter type-id='type-id-334'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-708'>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-709'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-517' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -7931,20 +7931,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-519'/>
             <parameter type-id='type-id-492'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-710'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;long unsigned int&gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-711'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-536' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -7953,20 +7953,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-538'/>
             <parameter type-id='type-id-492'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-712'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, HeapLeakChecker::RangeValue&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-713'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-540' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -7975,20 +7975,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-542'/>
             <parameter type-id='type-id-492'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-714'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const long unsigned int, long unsigned int&gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-715'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-544' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -7997,20 +7997,20 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-716' is-artificial='yes'/>
             <parameter type-id='type-id-546'/>
             <parameter type-id='type-id-492'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-716'>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;std::pair&lt;const std::basic_string&lt;char, std::char_traits&lt;char&gt;, STL_Allocator&lt;char, HeapLeakChecker::Allocator&gt; &gt;, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;, bool&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='68' column='1' id='type-id-717'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-548' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='72' column='1'/>
         </data-member>
@@ -8019,13 +8019,13 @@
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_pair.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-717' is-artificial='yes'/>
+            <parameter type-id='type-id-718' is-artificial='yes'/>
             <parameter type-id='type-id-550'/>
             <parameter type-id='type-id-492'/>
             <return type-id='type-id-75'/>
@@ -8143,10 +8143,10 @@
         <return type-id='type-id-322'/>
       </function-decl>
       <function-decl name='__copy_move_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__copy_move_a2&lt;false, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-410'/>
@@ -8155,10 +8155,10 @@
         <return type-id='type-id-410'/>
       </function-decl>
       <function-decl name='__copy_move_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='copy&lt;__gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;AllocObject*, std::vector&lt;AllocObject, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt; &gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-410'/>
@@ -8167,10 +8167,10 @@
         <return type-id='type-id-410'/>
       </function-decl>
       <function-decl name='copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a&lt;false, AllocObject*, AllocObject*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-322'/>
@@ -8179,10 +8179,10 @@
         <return type-id='type-id-322'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-174'/>
@@ -8197,10 +8197,10 @@
         <return type-id='type-id-322'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__copy_move_backward_a2&lt;false, void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-174'/>
@@ -8215,10 +8215,10 @@
         <return type-id='type-id-322'/>
       </function-decl>
       <function-decl name='copy_backward&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='copy_backward&lt;void**, void**&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-174'/>
@@ -8227,8 +8227,8 @@
         <return type-id='type-id-174'/>
       </function-decl>
       <function-decl name='_Destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
         <return type-id='type-id-75'/>
       </function-decl>
       <function-decl name='_Destroy&lt;AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8244,9 +8244,9 @@
         <return type-id='type-id-75'/>
       </function-decl>
       <function-decl name='_Destroy&lt;void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-686'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-687'/>
         <return type-id='type-id-75'/>
       </function-decl>
       <function-decl name='__distance&lt;const char*&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator_base_funcs.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8275,10 +8275,10 @@
         <return type-id='type-id-622'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-322'/>
@@ -8302,11 +8302,11 @@
         <return type-id='type-id-174'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;void (**)(), void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-686'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-687'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__uninitialized_move_a&lt;AllocObject*, AllocObject*, STL_Allocator&lt;AllocObject, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-322'/>
@@ -8316,11 +8316,11 @@
         <return type-id='type-id-322'/>
       </function-decl>
       <function-decl name='__uninitialized_move_a&lt;void (**)(), void (**)(), std::allocator&lt;void (*)()&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-731'/>
-        <parameter type-id='type-id-686'/>
-        <return type-id='type-id-731'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-732'/>
+        <parameter type-id='type-id-687'/>
+        <return type-id='type-id-732'/>
       </function-decl>
       <function-decl name='__uninitialized_move_a&lt;void**, void**, STL_Allocator&lt;void*, HeapLeakChecker::Allocator&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-174'/>
@@ -8570,7 +8570,7 @@
       </class-decl>
       <class-decl name='__normal_iterator&lt;void (**)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-416'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-731' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='683' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8581,20 +8581,20 @@
         <member-function access='private'>
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-418' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-734'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <return type-id='type-id-730'/>
+            <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8659,7 +8659,7 @@
         <member-function access='private'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-19'/>
             <return type-id='type-id-75'/>
           </function-decl>
@@ -8669,21 +8669,21 @@
             <parameter type-id='type-id-423' is-artificial='yes'/>
             <parameter type-id='type-id-19'/>
             <parameter type-id='type-id-73'/>
-            <return type-id='type-id-731'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <parameter type-id='type-id-731'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-729'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
@@ -8925,11 +8925,11 @@
     <function-decl name='HeapLeakChecker_AfterDestructors' mangled-name='_Z32HeapLeakChecker_AfterDestructorsv' filepath='src/heap-checker.cc' line='2311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32HeapLeakChecker_AfterDestructorsv'>
       <return type-id='type-id-75'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-725'>
+    <function-type size-in-bits='64' id='type-id-641'>
       <parameter type-id='type-id-276'/>
       <return type-id='type-id-7'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-734'>
+    <function-type size-in-bits='64' id='type-id-727'>
       <parameter type-id='type-id-442'/>
       <return type-id='type-id-75'/>
     </function-type>
@@ -9157,13 +9157,13 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-940'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-940'/>
           </function-decl>
         </member-function>
@@ -9243,13 +9243,13 @@
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-910' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIP17HeapProfileBucketSt4pairIKS1_N16HeapProfileTable8Snapshot5EntryEESt10_Select1stIS7_ESt4lessIS1_ESaIS7_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-910' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -9806,13 +9806,13 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-972'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-972'/>
           </function-decl>
         </member-function>
@@ -9872,13 +9872,13 @@
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-965' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-965' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -11968,13 +11968,13 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIN15MemoryRegionMap6RegionES1_St9_IdentityIS1_ENS0_9RegionCmpE13STL_AllocatorIS1_NS0_11MyAllocatorEEE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-821'/>
           </function-decl>
         </member-function>
@@ -14195,13 +14195,13 @@
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE7_S_leftEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='508' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-972'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE8_S_rightEPSt18_Rb_tree_node_base' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-675'/>
+            <parameter type-id='type-id-676'/>
             <return type-id='type-id-972'/>
           </function-decl>
         </member-function>
@@ -14261,13 +14261,13 @@
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE12_M_rightmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-965' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIPKvSt4pairIKS1_PKcESt10_Select1stIS6_ESt4lessIS1_ESaIS6_EE11_M_leftmostEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_tree.h' line='465' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-965' is-artificial='yes'/>
-            <return type-id='type-id-676'/>
+            <return type-id='type-id-677'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
@@ -17168,8 +17168,8 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-732'/>
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
@@ -17320,10 +17320,10 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-729'/>
-            <parameter type-id='type-id-729'/>
-            <parameter type-id='type-id-731'/>
-            <return type-id='type-id-731'/>
+            <parameter type-id='type-id-730'/>
+            <parameter type-id='type-id-730'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -17362,10 +17362,10 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_move_b&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-729'/>
-            <parameter type-id='type-id-729'/>
-            <parameter type-id='type-id-731'/>
-            <return type-id='type-id-731'/>
+            <parameter type-id='type-id-730'/>
+            <parameter type-id='type-id-730'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -17412,10 +17412,10 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-731'/>
-            <parameter type-id='type-id-731'/>
-            <parameter type-id='type-id-731'/>
-            <return type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-732'/>
+            <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -17498,13 +17498,13 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_refdata' mangled-name='_ZNSs4_Rep10_M_refdataEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <return type-id='type-id-3'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_dispose' mangled-name='_ZNSs4_Rep10_M_disposeERKSaIcE' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-694' is-artificial='yes'/>
+                <parameter type-id='type-id-695' is-artificial='yes'/>
                 <parameter type-id='type-id-837'/>
                 <return type-id='type-id-75'/>
               </function-decl>
@@ -17679,7 +17679,7 @@
         <member-function access='private'>
           <function-decl name='_M_rep' mangled-name='_ZNKSs6_M_repEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/basic_string.h' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1512' is-artificial='yes'/>
-            <return type-id='type-id-694'/>
+            <return type-id='type-id-695'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index c55e6440..d0efa871 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1096,10 +1096,10 @@
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-130'/>
     <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-131'/>
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-93'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-55'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-109'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-55'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-109'/>
+    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
     <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-138'/>
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-72'/>
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
@@ -1426,7 +1426,7 @@
       <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-133'/>
+      <parameter type-id='type-id-136'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='exit' filepath='/usr/include/stdlib.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1519,23 +1519,23 @@
       <return type-id='type-id-2'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-132'>
-      <return type-id='type-id-99'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-134'>
       <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-93'/>
       <return type-id='type-id-99'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-135'>
+    <function-type size-in-bits='64' id='type-id-133'>
       <parameter type-id='type-id-124'/>
       <parameter type-id='type-id-125'/>
       <return type-id='type-id-99'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-136'>
+    <function-type size-in-bits='64' id='type-id-134'>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-99'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-135'>
+      <return type-id='type-id-99'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-137'>
       <parameter type-id='type-id-39'/>
       <return type-id='type-id-99'/>
@@ -2927,11 +2927,11 @@
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-181'/>
     <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-192'/>
     <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-202'/>
     <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-200'/>
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-194'/>
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-202'/>
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-201'/>
     <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-198'/>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-199'/>
@@ -2993,12 +2993,12 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-206'>
+    <function-type size-in-bits='64' id='type-id-207'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-207'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <parameter type-id='type-id-39'/>
       <return type-id='type-id-197'/>
     </function-type>
@@ -5660,17 +5660,17 @@
     <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-368'/>
     <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-254'/>
     <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-374'/>
     <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-373'/>
     <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-365'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-388'/>
-    <pointer-type-def type-id='type-id-410' size-in-bits='64' id='type-id-336'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-336'/>
     <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-347'/>
     <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-265'/>
-    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-411'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-412'/>
+    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-413'/>
     <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-379'/>
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-293'/>
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-374'/>
     <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-231'/>
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-257'/>
     <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-242'/>
@@ -5780,12 +5780,12 @@
     </function-decl>
     <typedef-decl name='iconv_t' type-id='type-id-39' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-370'/>
     <function-decl name='time' filepath='/usr/include/time.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-411'/>
+      <parameter type-id='type-id-412'/>
       <return type-id='type-id-390'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-404'/>
-      <return type-id='type-id-412'/>
+      <return type-id='type-id-413'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-406'/>
@@ -5829,11 +5829,11 @@
       <parameter type-id='type-id-228'/>
       <return type-id='type-id-230'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-413'>
+    <function-type size-in-bits='64' id='type-id-410'>
       <parameter type-id='type-id-284'/>
       <return type-id='type-id-286'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-410'>
+    <function-type size-in-bits='64' id='type-id-411'>
       <parameter type-id='type-id-222'/>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-2'/>
@@ -6961,9 +6961,9 @@
     <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-493'/>
     <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-495'/>
     <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
     <pointer-type-def type-id='type-id-506' size-in-bits='64' id='type-id-492'/>
     <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-500' size-in-bits='64' id='type-id-145'/>
     <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-497'/>
     <function-decl name='pex_init_common' mangled-name='pex_init_common' filepath='../.././libiberty/pex-common.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_init_common'>
       <parameter type-id='type-id-2' name='flags' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
@@ -7241,7 +7241,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xexit.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <var-decl name='_xexit_cleanup' type-id='type-id-133' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
+    <var-decl name='_xexit_cleanup' type-id='type-id-136' mangled-name='_xexit_cleanup' visibility='default' filepath='../.././libiberty/xexit.c' line='44' column='1' elf-symbol-id='_xexit_cleanup'/>
   </abi-instr>
   <abi-instr address-size='64' path='../.././libiberty/xmalloc.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <typedef-decl name='__intptr_t' type-id='type-id-28' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-522'/>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 2ade2cff..751afce2 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -27671,8 +27671,8 @@
     <pointer-type-def type-id='type-id-1336' size-in-bits='64' id='type-id-1379'/>
     <pointer-type-def type-id='type-id-1380' size-in-bits='64' id='type-id-1381'/>
     <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1383'/>
-    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1385'/>
-    <pointer-type-def type-id='type-id-1386' size-in-bits='64' id='type-id-1233'/>
+    <pointer-type-def type-id='type-id-1384' size-in-bits='64' id='type-id-1233'/>
+    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-1386'/>
     <namespace-decl name='std'>
       <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1723' column='1' id='type-id-1257'>
         <member-type access='private'>
@@ -28136,7 +28136,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1408'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1257'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1385' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-1409'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1386' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-1409'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-1409' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
@@ -29168,13 +29168,13 @@
       <parameter type-id='type-id-1410'/>
       <return type-id='type-id-38'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1384'>
+    <function-type size-in-bits='64' id='type-id-1385'>
       <parameter type-id='type-id-1255'/>
       <parameter type-id='type-id-1312'/>
       <parameter type-id='type-id-1447'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-1433' id='type-id-1386'>
+    <function-type size-in-bits='64' method-class-id='type-id-1433' id='type-id-1384'>
       <parameter type-id='type-id-1446' is-artificial='yes'/>
       <return type-id='type-id-5'/>
     </function-type>
@@ -29209,168 +29209,168 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='../../../.././libstdc++-v3/src/c++11/future.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/src/c++11' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1462'/>
-    <qualified-type-def type-id='type-id-1463' const='yes' id='type-id-1464'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1464' size-in-bits='64' id='type-id-1465'/>
-    <qualified-type-def type-id='type-id-1466' const='yes' id='type-id-1467'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1467' size-in-bits='64' id='type-id-1468'/>
-    <qualified-type-def type-id='type-id-1469' const='yes' id='type-id-1470'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1470' size-in-bits='64' id='type-id-1471'/>
-    <qualified-type-def type-id='type-id-1472' const='yes' id='type-id-1473'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1473' size-in-bits='64' id='type-id-1474'/>
-    <qualified-type-def type-id='type-id-1475' const='yes' id='type-id-1476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1476' size-in-bits='64' id='type-id-1477'/>
-    <qualified-type-def type-id='type-id-1478' const='yes' id='type-id-1479'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1479' size-in-bits='64' id='type-id-1480'/>
-    <qualified-type-def type-id='type-id-1481' const='yes' id='type-id-1482'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1483'/>
-    <qualified-type-def type-id='type-id-1484' const='yes' id='type-id-1485'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1485' size-in-bits='64' id='type-id-1486'/>
-    <pointer-type-def type-id='type-id-1485' size-in-bits='64' id='type-id-1487'/>
-    <qualified-type-def type-id='type-id-1488' const='yes' id='type-id-1489'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1489' size-in-bits='64' id='type-id-1490'/>
-    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-1491'/>
-    <qualified-type-def type-id='type-id-626' const='yes' id='type-id-1492'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1492' size-in-bits='64' id='type-id-631'/>
-    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1493'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
-    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-629'/>
-    <qualified-type-def type-id='type-id-1495' const='yes' id='type-id-1496'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1496' size-in-bits='64' id='type-id-1497'/>
-    <pointer-type-def type-id='type-id-1496' size-in-bits='64' id='type-id-1498'/>
+    <qualified-type-def type-id='type-id-1461' const='yes' id='type-id-1462'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1462' size-in-bits='64' id='type-id-1463'/>
+    <qualified-type-def type-id='type-id-1464' const='yes' id='type-id-1465'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
+    <qualified-type-def type-id='type-id-1467' const='yes' id='type-id-1468'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1468' size-in-bits='64' id='type-id-1469'/>
+    <qualified-type-def type-id='type-id-1470' const='yes' id='type-id-1471'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
+    <qualified-type-def type-id='type-id-1473' const='yes' id='type-id-1474'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1474' size-in-bits='64' id='type-id-1475'/>
+    <qualified-type-def type-id='type-id-1476' const='yes' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1477' size-in-bits='64' id='type-id-1478'/>
+    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-1480'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1480' size-in-bits='64' id='type-id-1481'/>
+    <qualified-type-def type-id='type-id-1482' const='yes' id='type-id-1483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1483' size-in-bits='64' id='type-id-1484'/>
+    <pointer-type-def type-id='type-id-1483' size-in-bits='64' id='type-id-1485'/>
+    <qualified-type-def type-id='type-id-1486' const='yes' id='type-id-1487'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1487' size-in-bits='64' id='type-id-1488'/>
+    <qualified-type-def type-id='type-id-625' const='yes' id='type-id-1489'/>
+    <qualified-type-def type-id='type-id-626' const='yes' id='type-id-1490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1490' size-in-bits='64' id='type-id-631'/>
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-1491'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1491' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-629'/>
+    <qualified-type-def type-id='type-id-1493' const='yes' id='type-id-1494'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1494' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-1494' size-in-bits='64' id='type-id-1496'/>
     <reference-type-def kind='lvalue' type-id='type-id-316' size-in-bits='64' id='type-id-383'/>
-    <qualified-type-def type-id='type-id-1499' const='yes' id='type-id-1500'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1500' size-in-bits='64' id='type-id-1501'/>
-    <pointer-type-def type-id='type-id-1500' size-in-bits='64' id='type-id-1502'/>
-    <qualified-type-def type-id='type-id-1503' const='yes' id='type-id-1504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
-    <qualified-type-def type-id='type-id-1506' const='yes' id='type-id-1507'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1507' size-in-bits='64' id='type-id-1508'/>
-    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1509'/>
-    <pointer-type-def type-id='type-id-1509' size-in-bits='64' id='type-id-1437'/>
-    <qualified-type-def type-id='type-id-1510' const='yes' id='type-id-1511'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1512'/>
-    <qualified-type-def type-id='type-id-1513' const='yes' id='type-id-1514'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1514' size-in-bits='64' id='type-id-1515'/>
-    <qualified-type-def type-id='type-id-1516' const='yes' id='type-id-1517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1517' size-in-bits='64' id='type-id-1518'/>
-    <qualified-type-def type-id='type-id-1519' const='yes' id='type-id-1520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1520' size-in-bits='64' id='type-id-1521'/>
-    <qualified-type-def type-id='type-id-1522' const='yes' id='type-id-1523'/>
+    <qualified-type-def type-id='type-id-1497' const='yes' id='type-id-1498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1499'/>
+    <pointer-type-def type-id='type-id-1498' size-in-bits='64' id='type-id-1500'/>
+    <qualified-type-def type-id='type-id-1501' const='yes' id='type-id-1502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1502' size-in-bits='64' id='type-id-1503'/>
+    <qualified-type-def type-id='type-id-1504' const='yes' id='type-id-1505'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1505' size-in-bits='64' id='type-id-1506'/>
+    <qualified-type-def type-id='type-id-1380' const='yes' id='type-id-1507'/>
+    <pointer-type-def type-id='type-id-1507' size-in-bits='64' id='type-id-1437'/>
+    <qualified-type-def type-id='type-id-1508' const='yes' id='type-id-1509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1509' size-in-bits='64' id='type-id-1510'/>
+    <qualified-type-def type-id='type-id-1511' const='yes' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
+    <qualified-type-def type-id='type-id-1514' const='yes' id='type-id-1515'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1515' size-in-bits='64' id='type-id-1516'/>
+    <qualified-type-def type-id='type-id-1517' const='yes' id='type-id-1518'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1518' size-in-bits='64' id='type-id-1519'/>
+    <qualified-type-def type-id='type-id-1520' const='yes' id='type-id-1521'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1521' size-in-bits='64' id='type-id-1522'/>
+    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1523'/>
     <reference-type-def kind='lvalue' type-id='type-id-1523' size-in-bits='64' id='type-id-1524'/>
-    <qualified-type-def type-id='type-id-633' const='yes' id='type-id-1525'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1525' size-in-bits='64' id='type-id-1526'/>
-    <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-1527'/>
-    <qualified-type-def type-id='type-id-1528' const='yes' id='type-id-1529'/>
+    <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1525'/>
+    <qualified-type-def type-id='type-id-1526' const='yes' id='type-id-1527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1527' size-in-bits='64' id='type-id-1528'/>
+    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-1529'/>
     <reference-type-def kind='lvalue' type-id='type-id-1529' size-in-bits='64' id='type-id-1530'/>
-    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-1531'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1531' size-in-bits='64' id='type-id-1532'/>
-    <pointer-type-def type-id='type-id-1531' size-in-bits='64' id='type-id-1533'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1463' size-in-bits='64' id='type-id-1534'/>
-    <pointer-type-def type-id='type-id-1463' size-in-bits='64' id='type-id-1535'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1466' size-in-bits='64' id='type-id-1536'/>
-    <pointer-type-def type-id='type-id-1466' size-in-bits='64' id='type-id-1537'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1469' size-in-bits='64' id='type-id-1538'/>
-    <pointer-type-def type-id='type-id-1469' size-in-bits='64' id='type-id-1539'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1472' size-in-bits='64' id='type-id-1540'/>
-    <pointer-type-def type-id='type-id-1472' size-in-bits='64' id='type-id-1541'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1475' size-in-bits='64' id='type-id-1542'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1478' size-in-bits='64' id='type-id-1543'/>
-    <pointer-type-def type-id='type-id-1478' size-in-bits='64' id='type-id-1544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1481' size-in-bits='64' id='type-id-1545'/>
-    <pointer-type-def type-id='type-id-1481' size-in-bits='64' id='type-id-1546'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1484' size-in-bits='64' id='type-id-1547'/>
-    <pointer-type-def type-id='type-id-1484' size-in-bits='64' id='type-id-1548'/>
-    <reference-type-def kind='lvalue' type-id='type-id-625' size-in-bits='64' id='type-id-1549'/>
+    <pointer-type-def type-id='type-id-1529' size-in-bits='64' id='type-id-1531'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1461' size-in-bits='64' id='type-id-1532'/>
+    <pointer-type-def type-id='type-id-1461' size-in-bits='64' id='type-id-1533'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1464' size-in-bits='64' id='type-id-1534'/>
+    <pointer-type-def type-id='type-id-1464' size-in-bits='64' id='type-id-1535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1467' size-in-bits='64' id='type-id-1536'/>
+    <pointer-type-def type-id='type-id-1467' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1470' size-in-bits='64' id='type-id-1538'/>
+    <pointer-type-def type-id='type-id-1470' size-in-bits='64' id='type-id-1539'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1473' size-in-bits='64' id='type-id-1540'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1476' size-in-bits='64' id='type-id-1541'/>
+    <pointer-type-def type-id='type-id-1476' size-in-bits='64' id='type-id-1542'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1479' size-in-bits='64' id='type-id-1543'/>
+    <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-1544'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1482' size-in-bits='64' id='type-id-1545'/>
+    <pointer-type-def type-id='type-id-1482' size-in-bits='64' id='type-id-1546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-625' size-in-bits='64' id='type-id-1547'/>
     <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-627'/>
-    <qualified-type-def type-id='type-id-627' const='yes' id='type-id-1550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1550' size-in-bits='64' id='type-id-1551'/>
-    <reference-type-def kind='lvalue' type-id='type-id-627' size-in-bits='64' id='type-id-1552'/>
-    <reference-type-def kind='lvalue' type-id='type-id-626' size-in-bits='64' id='type-id-1553'/>
+    <qualified-type-def type-id='type-id-627' const='yes' id='type-id-1548'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1548' size-in-bits='64' id='type-id-1549'/>
+    <reference-type-def kind='lvalue' type-id='type-id-627' size-in-bits='64' id='type-id-1550'/>
+    <reference-type-def kind='lvalue' type-id='type-id-626' size-in-bits='64' id='type-id-1551'/>
     <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-630'/>
-    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-1554'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1554' size-in-bits='64' id='type-id-1555'/>
-    <reference-type-def kind='lvalue' type-id='type-id-630' size-in-bits='64' id='type-id-1556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1557'/>
-    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-1558'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1495' size-in-bits='64' id='type-id-1559'/>
-    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1561'/>
-    <pointer-type-def type-id='type-id-1499' size-in-bits='64' id='type-id-1562'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1503' size-in-bits='64' id='type-id-1563'/>
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1564'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1510' size-in-bits='64' id='type-id-1565'/>
-    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-621'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1566' size-in-bits='64' id='type-id-1567'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1513' size-in-bits='64' id='type-id-1568'/>
-    <pointer-type-def type-id='type-id-1513' size-in-bits='64' id='type-id-1569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1516' size-in-bits='64' id='type-id-1570'/>
-    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1519' size-in-bits='64' id='type-id-1572'/>
-    <pointer-type-def type-id='type-id-1519' size-in-bits='64' id='type-id-1573'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1522' size-in-bits='64' id='type-id-1574'/>
-    <pointer-type-def type-id='type-id-1522' size-in-bits='64' id='type-id-1575'/>
-    <reference-type-def kind='lvalue' type-id='type-id-633' size-in-bits='64' id='type-id-1576'/>
-    <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-1577'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-1578'/>
+    <qualified-type-def type-id='type-id-630' const='yes' id='type-id-1552'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-630' size-in-bits='64' id='type-id-1554'/>
+    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1555'/>
+    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-1556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1493' size-in-bits='64' id='type-id-1557'/>
+    <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1558'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1497' size-in-bits='64' id='type-id-1559'/>
+    <pointer-type-def type-id='type-id-1497' size-in-bits='64' id='type-id-1560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1501' size-in-bits='64' id='type-id-1561'/>
+    <pointer-type-def type-id='type-id-1501' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1508' size-in-bits='64' id='type-id-1563'/>
+    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1566'/>
+    <pointer-type-def type-id='type-id-1511' size-in-bits='64' id='type-id-1567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1514' size-in-bits='64' id='type-id-1568'/>
+    <pointer-type-def type-id='type-id-1514' size-in-bits='64' id='type-id-1569'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1517' size-in-bits='64' id='type-id-1570'/>
+    <pointer-type-def type-id='type-id-1517' size-in-bits='64' id='type-id-1571'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1520' size-in-bits='64' id='type-id-1572'/>
+    <pointer-type-def type-id='type-id-1520' size-in-bits='64' id='type-id-1573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-633' size-in-bits='64' id='type-id-1574'/>
+    <pointer-type-def type-id='type-id-633' size-in-bits='64' id='type-id-1575'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1526' size-in-bits='64' id='type-id-1576'/>
+    <pointer-type-def type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
     <reference-type-def kind='lvalue' type-id='type-id-634' size-in-bits='64' id='type-id-1579'/>
     <pointer-type-def type-id='type-id-634' size-in-bits='64' id='type-id-1580'/>
     <qualified-type-def type-id='type-id-1581' const='yes' id='type-id-1582'/>
     <namespace-decl name='std'>
-      <class-decl name='__basic_future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='552' column='1' id='type-id-1484'>
+      <class-decl name='__basic_future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='552' column='1' id='type-id-1482'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-619'/>
         <member-type access='protected'>
-          <typedef-decl name='__result_type' type-id='type-id-1549' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='556' column='1' id='type-id-1583'/>
+          <typedef-decl name='__result_type' type-id='type-id-1547' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='556' column='1' id='type-id-1583'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='__state_type' type-id='type-id-1516' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='555' column='1' id='type-id-1488'/>
+          <typedef-decl name='__state_type' type-id='type-id-1514' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='555' column='1' id='type-id-1486'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_state' type-id='type-id-1488' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='559' column='1'/>
+          <var-decl name='_M_state' type-id='type-id-1486' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='559' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='563' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1486'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1490'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1488'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='619' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1568'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1566'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='627' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1563'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1561'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__basic_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-1495'>
+      <class-decl name='__shared_ptr&lt;std::__future_base::_State_base, (__gnu_cxx::_Lock_policy)2u&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='760' column='1' id='type-id-1493'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_ptr' type-id='type-id-559' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='1061' column='1'/>
         </data-member>
@@ -29379,103 +29379,103 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1560' is-artificial='yes'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='811' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1560' is-artificial='yes'/>
-            <parameter type-id='type-id-1497'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-1495'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1560' is-artificial='yes'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='821' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1560' is-artificial='yes'/>
-            <parameter type-id='type-id-1559'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-1557'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr_base.h' line='874' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1560' is-artificial='yes'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;std::unique_ptr&lt;std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter&gt;()&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2024' column='1' id='type-id-1499'>
+      <class-decl name='function&lt;std::unique_ptr&lt;std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter&gt;()&gt;' size-in-bits='256' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2024' column='1' id='type-id-1497'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1584'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1257'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1462' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-1585'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1578' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-1585'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
           <var-decl name='_M_invoker' type-id='type-id-1585' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2041' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1562' is-artificial='yes'/>
+            <parameter type-id='type-id-1560' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2048' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1562' is-artificial='yes'/>
+            <parameter type-id='type-id-1560' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1562' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
+            <parameter type-id='type-id-1560' is-artificial='yes'/>
+            <parameter type-id='type-id-1499'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2068' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1562' is-artificial='yes'/>
-            <parameter type-id='type-id-1561'/>
+            <parameter type-id='type-id-1560' is-artificial='yes'/>
+            <parameter type-id='type-id-1559'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='728' column='1' id='type-id-1503'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1484'/>
+      <class-decl name='future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='728' column='1' id='type-id-1501'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1482'/>
         <member-type access='private'>
-          <typedef-decl name='__state_type' type-id='type-id-1488' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='737' column='1' id='type-id-1506'/>
+          <typedef-decl name='__state_type' type-id='type-id-1486' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='737' column='1' id='type-id-1504'/>
         </member-type>
         <member-function access='private'>
           <function-decl name='future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
+            <parameter type-id='type-id-1562' is-artificial='yes'/>
+            <parameter type-id='type-id-1506'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <parameter type-id='type-id-1562' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='746' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-1563'/>
+            <parameter type-id='type-id-1562' is-artificial='yes'/>
+            <parameter type-id='type-id-1561'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1564' is-artificial='yes'/>
-            <parameter type-id='type-id-1505'/>
+            <parameter type-id='type-id-1562' is-artificial='yes'/>
+            <parameter type-id='type-id-1503'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29520,12 +29520,12 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='promise&lt;void&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1106' column='1' id='type-id-1510'>
+      <class-decl name='promise&lt;void&gt;' size-in-bits='192' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1106' column='1' id='type-id-1508'>
         <member-type access='private'>
           <typedef-decl name='_Ptr_type' type-id='type-id-632' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1110' column='1' id='type-id-1586'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_future' type-id='type-id-1516' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1113' column='1'/>
+          <var-decl name='_M_future' type-id='type-id-1514' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1113' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_storage' type-id='type-id-1586' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1114' column='1'/>
@@ -29539,14 +29539,14 @@
         <member-function access='private'>
           <function-decl name='promise' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1122' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-621' is-artificial='yes'/>
-            <parameter type-id='type-id-1565'/>
+            <parameter type-id='type-id-1563'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='promise' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='1139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-621' is-artificial='yes'/>
-            <parameter type-id='type-id-1512'/>
+            <parameter type-id='type-id-1510'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29558,123 +29558,123 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='855' column='1' id='type-id-1513'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1484'/>
+      <class-decl name='shared_future&lt;void&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='855' column='1' id='type-id-1511'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1482'/>
         <member-function access='private'>
           <function-decl name='shared_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='860' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
+            <parameter type-id='type-id-1567' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='863' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1567' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='866' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1563'/>
+            <parameter type-id='type-id-1567' is-artificial='yes'/>
+            <parameter type-id='type-id-1561'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_future' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1568'/>
+            <parameter type-id='type-id-1567' is-artificial='yes'/>
+            <parameter type-id='type-id-1566'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;std::__future_base::_State_base&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='93' column='1' id='type-id-1516'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1495'/>
+      <class-decl name='shared_ptr&lt;std::__future_base::_State_base&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='93' column='1' id='type-id-1514'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1493'/>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1571' is-artificial='yes'/>
+            <parameter type-id='type-id-1569' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-1518'/>
+            <parameter type-id='type-id-1569' is-artificial='yes'/>
+            <parameter type-id='type-id-1516'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1571' is-artificial='yes'/>
-            <parameter type-id='type-id-1570'/>
+            <parameter type-id='type-id-1569' is-artificial='yes'/>
+            <parameter type-id='type-id-1568'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/shared_ptr.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1571' is-artificial='yes'/>
+            <parameter type-id='type-id-1569' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='507' column='1' id='type-id-1519'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1472'/>
+      <class-decl name='tuple&lt;std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='507' column='1' id='type-id-1517'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1470'/>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1571' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
-            <parameter type-id='type-id-1551'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1571' is-artificial='yes'/>
+            <parameter type-id='type-id-1549'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
-            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1571' is-artificial='yes'/>
+            <parameter type-id='type-id-1519'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1573' is-artificial='yes'/>
-            <parameter type-id='type-id-1572'/>
+            <parameter type-id='type-id-1571' is-artificial='yes'/>
+            <parameter type-id='type-id-1570'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='507' column='1' id='type-id-1522'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1478'/>
+      <class-decl name='tuple&lt;std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='507' column='1' id='type-id-1520'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1476'/>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='512' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
+            <parameter type-id='type-id-1573' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <parameter type-id='type-id-1555'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1553'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <parameter type-id='type-id-1524'/>
+            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1522'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='tuple' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <parameter type-id='type-id-1574'/>
+            <parameter type-id='type-id-1573' is-artificial='yes'/>
+            <parameter type-id='type-id-1572'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29688,10 +29688,10 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1519' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1589'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1517' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1589'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='deleter_type' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='111' column='1' id='type-id-1528'/>
+          <typedef-decl name='deleter_type' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='111' column='1' id='type-id-1526'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1588' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='109' column='1' id='type-id-1590'/>
@@ -29701,20 +29701,20 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
             <parameter type-id='type-id-1591'/>
             <return type-id='type-id-5'/>
@@ -29722,36 +29722,36 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <parameter type-id='type-id-1590'/>
-            <parameter type-id='type-id-1567'/>
+            <parameter type-id='type-id-1565'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
-            <parameter type-id='type-id-1576'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
+            <parameter type-id='type-id-1574'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
             <parameter type-id='type-id-6' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1577' is-artificial='yes'/>
-            <parameter type-id='type-id-1526'/>
+            <parameter type-id='type-id-1575' is-artificial='yes'/>
+            <parameter type-id='type-id-1524'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29765,7 +29765,7 @@
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1522' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1594'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1520' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='105' column='1' id='type-id-1594'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='pointer' type-id='type-id-1593' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='109' column='1' id='type-id-1595'/>
@@ -29798,7 +29798,7 @@
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
             <parameter type-id='type-id-1595'/>
-            <parameter type-id='type-id-1567'/>
+            <parameter type-id='type-id-1565'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -29825,221 +29825,221 @@
         <member-function access='private'>
           <function-decl name='unique_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
-            <parameter type-id='type-id-1532'/>
+            <parameter type-id='type-id-1530'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='get_deleter' mangled-name='_ZNSt10unique_ptrINSt13__future_base12_Result_baseENS1_8_DeleterEE11get_deleterEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/unique_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1580' is-artificial='yes'/>
-            <return type-id='type-id-1578'/>
+            <return type-id='type-id-1576'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-1463'>
+      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result&lt;void&gt;*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-1461'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-627' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1533' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
-            <parameter type-id='type-id-1551'/>
+            <parameter type-id='type-id-1533' is-artificial='yes'/>
+            <parameter type-id='type-id-1549'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1533' is-artificial='yes'/>
             <parameter type-id='type-id-606'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result_base*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-1466'>
+      <class-decl name='_Head_base&lt;0ul, std::__future_base::_Result_base*, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='122' column='1' id='type-id-1464'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-630' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1537' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1537' is-artificial='yes'/>
-            <parameter type-id='type-id-1555'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
+            <parameter type-id='type-id-1553'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1537' is-artificial='yes'/>
+            <parameter type-id='type-id-1535' is-artificial='yes'/>
             <parameter type-id='type-id-606'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPNSt13__future_base12_Result_baseELb0EE7_M_headERS3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1536'/>
-            <return type-id='type-id-1556'/>
+            <parameter type-id='type-id-1534'/>
+            <return type-id='type-id-1554'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-1469'>
+      <class-decl name='_Head_base&lt;1ul, std::__future_base::_Result_base::_Deleter, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='76' column='1' id='type-id-1467'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-628'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
+            <parameter type-id='type-id-1537' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1537' is-artificial='yes'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
+            <parameter type-id='type-id-1537' is-artificial='yes'/>
             <parameter type-id='type-id-606'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ENSt13__future_base12_Result_base8_DeleterELb1EE7_M_headERS3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1538'/>
-            <return type-id='type-id-1557'/>
+            <parameter type-id='type-id-1536'/>
+            <return type-id='type-id-1555'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='_Maybe_unary_or_binary_function&lt;std::unique_ptr&lt;std::__future_base::_Result_base, std::__future_base::_Result_base::_Deleter&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='511' column='1' id='type-id-1584'/>
-      <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1472'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1481'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1463'/>
+      <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result&lt;void&gt;*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1470'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1479'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1461'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1481' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-1475'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1479' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='221' column='1' id='type-id-1473'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
+            <parameter type-id='type-id-1539' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <parameter type-id='type-id-1551'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1539' is-artificial='yes'/>
+            <parameter type-id='type-id-1549'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <parameter type-id='type-id-1474'/>
+            <parameter type-id='type-id-1539' is-artificial='yes'/>
+            <parameter type-id='type-id-1472'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1541' is-artificial='yes'/>
-            <parameter type-id='type-id-1540'/>
+            <parameter type-id='type-id-1539' is-artificial='yes'/>
+            <parameter type-id='type-id-1538'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1478'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1481'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1466'/>
+      <class-decl name='_Tuple_impl&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1476'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1479'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1464'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <parameter type-id='type-id-1542' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1544' is-artificial='yes'/>
-            <parameter type-id='type-id-1555'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1542' is-artificial='yes'/>
+            <parameter type-id='type-id-1553'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1544' is-artificial='yes'/>
-            <parameter type-id='type-id-1480'/>
+            <parameter type-id='type-id-1542' is-artificial='yes'/>
+            <parameter type-id='type-id-1478'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1544' is-artificial='yes'/>
-            <parameter type-id='type-id-1543'/>
+            <parameter type-id='type-id-1542' is-artificial='yes'/>
+            <parameter type-id='type-id-1541'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EIPNSt13__future_base12_Result_baseENS1_8_DeleterEEE7_M_headERS4_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1543'/>
-            <return type-id='type-id-1556'/>
+            <parameter type-id='type-id-1541'/>
+            <return type-id='type-id-1554'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1481'>
+      <class-decl name='_Tuple_impl&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='215' column='1' id='type-id-1479'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-553'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1469'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1467'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1546' is-artificial='yes'/>
-            <parameter type-id='type-id-1494'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <parameter type-id='type-id-1492'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1546' is-artificial='yes'/>
-            <parameter type-id='type-id-1483'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <parameter type-id='type-id-1481'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1546' is-artificial='yes'/>
-            <parameter type-id='type-id-1545'/>
+            <parameter type-id='type-id-1544' is-artificial='yes'/>
+            <parameter type-id='type-id-1543'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EINSt13__future_base12_Result_base8_DeleterEEE7_M_headERS3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1545'/>
-            <return type-id='type-id-1557'/>
+            <parameter type-id='type-id-1543'/>
+            <return type-id='type-id-1555'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_Result&lt;void&gt;, true, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1345' column='1' id='type-id-1596'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1549' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1597'/>
+          <typedef-decl name='type' type-id='type-id-1547' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1597'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_Result_base, true, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1345' column='1' id='type-id-1598'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1553' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1599'/>
+          <typedef-decl name='type' type-id='type-id-1551' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1346' column='1' id='type-id-1599'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_State_base, true, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1345' column='1' id='type-id-1600'>
@@ -30049,22 +30049,22 @@
       </class-decl>
       <class-decl name='__add_ref&lt;std::__future_base::_Result_base*&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='56' column='1' id='type-id-1602'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1556' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='57' column='1' id='type-id-1603'/>
+          <typedef-decl name='type' type-id='type-id-1554' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='57' column='1' id='type-id-1603'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_ref&lt;std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='56' column='1' id='type-id-1604'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1557' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='57' column='1' id='type-id-1605'/>
+          <typedef-decl name='type' type-id='type-id-1555' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='57' column='1' id='type-id-1605'/>
         </member-type>
       </class-decl>
       <class-decl name='conditional&lt;false, std::__future_base::_Result_base::_Deleter, const std::__future_base::_Result_base::_Deleter&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1735' column='1' id='type-id-1606'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1494' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1736' column='1' id='type-id-1591'/>
+          <typedef-decl name='type' type-id='type-id-1492' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1736' column='1' id='type-id-1591'/>
         </member-type>
       </class-decl>
       <class-decl name='remove_reference&lt;std::__future_base::_Result_base::_Deleter&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1326' column='1' id='type-id-1607'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-1566'/>
+          <typedef-decl name='type' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1327' column='1' id='type-id-1564'/>
         </member-type>
       </class-decl>
       <class-decl name='__weak_count&lt;(__gnu_cxx::_Lock_policy)2u&gt;' visibility='default' is-declaration-only='yes' id='type-id-1581'/>
@@ -30105,11 +30105,11 @@
         <return type-id='type-id-616'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1543'/>
+        <parameter type-id='type-id-1541'/>
         <return type-id='type-id-1603'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1ul, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1545'/>
+        <parameter type-id='type-id-1543'/>
         <return type-id='type-id-1605'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1ul, std::reference_wrapper&lt;std::thread&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='728' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -30121,11 +30121,11 @@
         <return type-id='type-id-616'/>
       </function-decl>
       <function-decl name='get&lt;0ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1574'/>
+        <parameter type-id='type-id-1572'/>
         <return type-id='type-id-1603'/>
       </function-decl>
       <function-decl name='get&lt;1ul, std::__future_base::_Result_base*, std::__future_base::_Result_base::_Deleter&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-1574'/>
+        <parameter type-id='type-id-1572'/>
         <return type-id='type-id-1605'/>
       </function-decl>
       <function-decl name='get&lt;1ul, std::_Mem_fn&lt;void (std::thread::*)()&gt;, std::reference_wrapper&lt;std::thread&gt; &gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/tuple' line='743' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -30133,7 +30133,7 @@
         <return type-id='type-id-618'/>
       </function-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-1461'>
+    <function-type size-in-bits='64' id='type-id-1577'>
       <parameter type-id='type-id-1255'/>
       <return type-id='type-id-634'/>
     </function-type>
@@ -48044,7 +48044,12 @@
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-52'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-2445' const='yes' id='type-id-2466'>
+    <function-type size-in-bits='64' method-class-id='type-id-2445' id='type-id-2466'>
+      <parameter type-id='type-id-1924' is-artificial='yes'/>
+      <parameter type-id='type-id-1217'/>
+      <return type-id='type-id-5'/>
+    </function-type>
+    <function-type size-in-bits='64' method-class-id='type-id-2445' const='yes' id='type-id-2467'>
       <parameter type-id='type-id-2446' is-artificial='yes'/>
       <parameter type-id='type-id-51'/>
       <parameter type-id='type-id-52'/>
@@ -48052,11 +48057,6 @@
       <parameter type-id='type-id-270'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-2445' id='type-id-2467'>
-      <parameter type-id='type-id-1924' is-artificial='yes'/>
-      <parameter type-id='type-id-1217'/>
-      <return type-id='type-id-5'/>
-    </function-type>
     <function-type size-in-bits='64' method-class-id='type-id-2403' id='type-id-2468'>
       <parameter type-id='type-id-1920' is-artificial='yes'/>
       <parameter type-id='type-id-1217'/>
@@ -59858,7 +59858,12 @@
       <parameter type-id='type-id-52'/>
       <return type-id='type-id-52'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-2489' const='yes' id='type-id-2866'>
+    <function-type size-in-bits='64' method-class-id='type-id-2489' id='type-id-2866'>
+      <parameter type-id='type-id-1937' is-artificial='yes'/>
+      <parameter type-id='type-id-1217'/>
+      <return type-id='type-id-5'/>
+    </function-type>
+    <function-type size-in-bits='64' method-class-id='type-id-2489' const='yes' id='type-id-2867'>
       <parameter type-id='type-id-2506' is-artificial='yes'/>
       <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-52'/>
@@ -59866,11 +59871,6 @@
       <parameter type-id='type-id-270'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' method-class-id='type-id-2489' id='type-id-2867'>
-      <parameter type-id='type-id-1937' is-artificial='yes'/>
-      <parameter type-id='type-id-1217'/>
-      <return type-id='type-id-5'/>
-    </function-type>
     <function-type size-in-bits='64' method-class-id='type-id-2494' id='type-id-2868'>
       <parameter type-id='type-id-1933' is-artificial='yes'/>
       <parameter type-id='type-id-1217'/>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index 7de73cb8..706a74bb 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -19,11 +19,11 @@
       <subrange length='3' lower-bound='0' upper-bound='2' type-id='type-id-4' id='type-id-13'/>
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='type-id-14'/>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='256' id='type-id-16'>
-      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-17'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='640' id='type-id-16'>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-17'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='640' id='type-id-19'>
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='type-id-4' id='type-id-20'/>
+    <array-type-def dimensions='1' type-id='type-id-18' size-in-bits='256' id='type-id-19'>
+      <subrange length='4' lower-bound='0' upper-bound='3' type-id='type-id-4' id='type-id-20'/>
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='160' id='type-id-21'>
       <subrange length='5' lower-bound='0' upper-bound='4' type-id='type-id-4' id='type-id-12'/>
@@ -40,7 +40,7 @@
         <var-decl name='c' type-id='type-id-11' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='5' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='d' type-id='type-id-19' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
+        <var-decl name='d' type-id='type-id-16' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='e' type-id='type-id-6' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='7' column='1'/>
@@ -51,8 +51,8 @@
     </class-decl>
     <reference-type-def kind='lvalue' type-id='type-id-22' size-in-bits='64' id='type-id-23'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-2'/>
-    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-15'/>
-    <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-18'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-15'/>
     <function-decl name='foo' mangled-name='_Z3fooR1S' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3fooR1S'>
       <parameter type-id='type-id-23'/>
       <return type-id='type-id-14'/>
diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi
index 8451151d..d451ff0f 100644
--- a/tests/data/test-read-dwarf/test7.so.hash.abi
+++ b/tests/data/test-read-dwarf/test7.so.hash.abi
@@ -19,12 +19,12 @@
       <subrange length='3' lower-bound='0' upper-bound='2' type-id='4c87fef4' id='56f209d2'/>
     </array-type-def>
     <type-decl name='int' size-in-bits='32' id='95e97e5e'/>
+    <array-type-def dimensions='1' type-id='99298bf9' size-in-bits='640' id='3360f342'>
+      <subrange length='10' lower-bound='0' upper-bound='9' type-id='4c87fef4' id='487da03a'/>
+    </array-type-def>
     <array-type-def dimensions='1' type-id='7292109c' size-in-bits='256' id='5abcdf1a'>
       <subrange length='4' lower-bound='0' upper-bound='3' type-id='4c87fef4' id='16fe7105'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='07535890' size-in-bits='640' id='bea34bd7'>
-      <subrange length='10' lower-bound='0' upper-bound='9' type-id='4c87fef4' id='487da03a'/>
-    </array-type-def>
     <array-type-def dimensions='1' type-id='95e97e5e' size-in-bits='160' id='e41e1db9'>
       <subrange length='5' lower-bound='0' upper-bound='4' type-id='4c87fef4' id='53010e10'/>
     </array-type-def>
@@ -40,7 +40,7 @@
         <var-decl name='c' type-id='9ba86d8c' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='5' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='d' type-id='bea34bd7' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
+        <var-decl name='d' type-id='3360f342' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='6' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='e' type-id='89feb1ec' visibility='default' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='7' column='1'/>
@@ -52,7 +52,7 @@
     <reference-type-def kind='lvalue' type-id='50d9a3fa' size-in-bits='64' id='f901ef4c'/>
     <pointer-type-def type-id='a84c031d' size-in-bits='64' id='26a90f95'/>
     <pointer-type-def type-id='95e97e5e' size-in-bits='64' id='7292109c'/>
-    <pointer-type-def type-id='5abcdf1a' size-in-bits='64' id='07535890'/>
+    <pointer-type-def type-id='5abcdf1a' size-in-bits='64' id='99298bf9'/>
     <function-decl name='foo' mangled-name='_Z3fooR1S' filepath='/home/ooprala/rh/u/libabigail/tests/data/test-read-dwarf/test7.cc' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z3fooR1S'>
       <parameter type-id='f901ef4c'/>
       <return type-id='95e97e5e'/>
-- 
2.39.3



-- 
		Dodji


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/4, applied] Bug 30260 - Support pointer-to-member type
  2023-12-01 15:51 [PATCH 0/4] Support C++ pointer-to-member types Dodji Seketeli
  2023-12-01 15:54 ` [PATCH 1/4, applied] Improve type naming Dodji Seketeli
@ 2023-12-01 15:54 ` Dodji Seketeli
  2023-12-01 15:55 ` [PATCH 3/4, applied] Bump abixml version to 2.3 Dodji Seketeli
  2023-12-01 15:57 ` [PATCH 4/4, applied] Bump LIBABIGAIL_SO_CURRENT version to 4 Dodji Seketeli
  3 siblings, 0 replies; 5+ messages in thread
From: Dodji Seketeli @ 2023-12-01 15:54 UTC (permalink / raw)
  To: Dodji Seketeli; +Cc: libabigail

Hello,

This adds support for C++ pointer-to-member types.

Here is a screenshot of what this patch enables libabigail to do:

    $ cat -n test-ptr-to-mbr-v0.cc
	 1	struct X
	 2	{
	 3	  void f(int);
	 4	  int a;
	 5	};
	 6
	 7	int X::* pmi = &X::a;
	 8	void (X::* pmf)(int) = &X::f;
	 9

    $ diff -u test-ptr-to-mbr-v0.cc test-ptr-to-mbr-v1.cc
    --- test-ptr-to-mbr-v0.cc	2023-11-22 15:22:04.258260701 +0100
    +++ test-ptr-to-mbr-v1.cc	2023-11-22 15:23:02.482621214 +0100
    @@ -1,9 +1,8 @@
     struct X
     {
    -  void f(int);
    -  int a;
    +  void f(int, char);
    +  char a;
     };

    -int X::* pmi = &X::a;
    -void (X::* pmf)(int) = &X::f;
    -
    +auto pmi = &X::a;
    +auto pmf = &X::f;

    $ abidiff test-ptr-to-mbr-v0.o test-ptr-to-mbr-v1.o
    Functions changes summary: 0 Removed, 0 Changed, 0 Added function
    Variables changes summary: 0 Removed, 2 Changed, 0 Added variables

    2 Changed variables:

      [C] 'void (X::* pmf)(int)' was changed to 'void (X::* pmf)(int, char)' at test-ptr-to-mbr-v1.cc:8:1:
	type of variable changed:
	  pointer-to-member type changed from: 'void (X::*)(int) to: 'void (X::*)(int, char)'
	  in containing type 'struct X' of pointed-to-member type 'void (X::*)(int)' at test-ptr-to-mbr-v1.cc:1:1:
	    type size changed from 32 to 8 (in bits)
	    1 data member change:
	      type of 'int a' changed:
		type name changed from 'int' to 'char'
		type size changed from 32 to 8 (in bits)

      [C] 'int X::* pmi' was changed to 'char X::* pmi' at test-ptr-to-mbr-v1.cc:7:1:
	type of variable changed:
	  pointer-to-member type changed from: 'int X::* to: 'char X::*'
	  in data member type 'int' of pointed-to-member type 'int X::*':
	    type name changed from 'int' to 'char'
	    type size changed from 32 to 8 (in bits)
	  containing type of pointer-to-member 'struct X' changed at test-ptr-to-mbr-v0.cc:1:1, as reported earlier

    $

	* include/abg-comparison.h (class ptr_to_mbr_diff): Declare new
	class.
	(ptr_to_mbr_diff_sptr): Declare new typedef.
	(compute_diff): Declare new overload for ptr_to_mbr_diff.
	(ptr_to_mbr_type_sptr): Declare new typedef.
	* src/abg-comparison-priv.h (struct ptr_to_mbr_diff::priv): Define
	* src/abg-comparison.cc (compute_diff_for_types): Support new
	ptr_to_mbr_type type.
	(ptr_to_mbr_diff::{ptr_to_mbr_diff, first_ptr_to_mbr_type,
	second_ptr_to_mbr_type, member_type_diff, containing_type_diff,
	has_changes, has_local_changes, get_pretty_representation, report,
	chain_into_hierarchy, ~ptr_to_mbr_diff}): Define member functions
	of class ptr_to_mbr_diff.
	(compute_diff): Define overload for ptr_to_mbr_type_sptr.
	* include/abg-fwd.h (ptr_to_mbr_type_sptr): Declare new typedef.
	(is_ptr_to_mbr_type, is_pointer_to_ptr_to_mbr_type)
	(is_typedef_of_maybe_qualified_class_or_union_type): Declare new
	functions.
	* include/abg-ir.h (type_maps::ptr_to_mbr_types): Declare new
	accessor.
	(POINTER_TO_MEMBER_TYPE): Add new enumerator to enum
	type_or_decl_base::type_or_decl_kind.
	(class ptr_to_mbr_type): Declare new class.
	(equals): Declare new overload for ptr_to_mbr_type.
	(ir_node_visitor::visit_{begin,end}): Declare new member
	functions.
	* src/abg-ir.cc (ptr_to_mbr_declaration_name)
	(ptr_to_mbr_declaration_name, add_outer_ptr_to_mbr_type_expr)
	(add_outer_pointer_to_ptr_to_mbr_type_expr): Define new static
	functions.
	(type_maps::priv::ptr_to_mbr_types_): Define new
	data member.
	(type_maps::ptr_to_mbr_types): Define new accessor.
	(is_ptr_to_mbr_type, is_pointer_to_ptr_to_mbr_type)
	(is_typedef_of_maybe_qualified_class_or_union_type): Define new
	functions.
	(maybe_update_types_lookup_map, equals): Define new overloads for
	ptr_to_mbr_type_sptr.
	(is_npaf_type): Use is_ptr_to_mbr_type.
	(maybe_update_types_lookup_map): In the overload for
	decl_base_sptr, call the new overload for ptr_to_mbr_type_sptr
	above.
	(struct ptr_to_mbr_type::priv): Define new struct.
	(ptr_to_mbr_type::{ptr_to_mbr_type, get_member_type,
	get_containing_type, operator==, get_qualified_name, traverse,
	~ptr_to_mbr_type}): Define member functions of ptr_to_mbr_type.
	(types_have_similar_structure): Support the new ptr_to_mbr_type
	type.
	(ir_node_visitor::visit_{begin,end}): Add new member functions.
	(var_decl::get_pretty_representation): Support pretty-printing
	pointer-to-member types.
	(pointer_declaration_name, array_declaration_name): Likewise.
	* include/abg-reporter.h ({reporter_base, default_reporter,
	leaf_reporter}::report): Add an overload for ptr_to_mbr_diff.
	(default_reporter::report_local_ptr_to_mbr_type_changes): Declare
	a member function.
	private data class of ptr_to_mbr_diff.
	* src/abg-default-reporter.cc
	(default_reporter::report_local_ptr_to_mbr_type_changes): Define
	member functions.
	(default_reporter::report): Define an overload for
	ptr_to_mbr_diff.
	* src/abg-leaf-reporter.cc (leaf_reporter::report): Likewise.
	* src/abg-dwarf-reader.cc (build_ptr_to_mbr_type): Define new
	function.
	(build_ir_node_from_die): Use the new build_ptr_to_mbr_type
	function.
	* src/abg-reader.cc (build_ptr_to_mbr_type): Define new function.
	(build_type): Use the new build_ptr_to_mbr_type above.
	* src/abg-writer.cc (write_ptr_to_mbr_type): Define new function.
	(write_type, write_decl, write_member_type): Use the new
	write_ptr_to_mbr_type above.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt:
	Add new test material.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc:
	Likewise.
	* tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o:
	Likewise.
	* tests/data/test-read-dwarf/test-pointer-to-member-1.cc:
	Likewise.
	* tests/data/test-read-dwarf/test-pointer-to-member-1.o: Likewise.
	* tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi:
	Likewise.
	* tests/data/Makefile.am: Add the new test material above to
	source distribution.
	* tests/test-abidiff-exit.cc (in_out_specs): Add the test material
	above to this test harness.
	* tests/test-annotate.cc (in_out_specs): Likewise.
	* tests/test-read-dwarf.cc: Likewise.
	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi: Adjust.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 include/abg-comparison.h                      |    62 +
 include/abg-fwd.h                             |    21 +
 include/abg-ir.h                              |    75 +-
 include/abg-reporter.h                        |    18 +
 src/abg-comparison-priv.h                     |    13 +
 src/abg-comparison.cc                         |   161 +
 src/abg-default-reporter.cc                   |    94 +
 src/abg-dwarf-reader.cc                       |    91 +-
 src/abg-ir.cc                                 |   749 +-
 src/abg-leaf-reporter.cc                      |    15 +
 src/abg-reader.cc                             |    85 +
 src/abg-writer.cc                             |   106 +-
 tests/data/Makefile.am                        |    29 +
 .../test-ptr-to-mbr1-output-1.txt             |    18 +
 .../pointer-to-member/test-ptr-to-mbr1-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr1-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr1-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr1-v1.o   |   Bin 0 -> 2656 bytes
 .../test-ptr-to-mbr2-output-1.txt             |    13 +
 .../pointer-to-member/test-ptr-to-mbr2-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr2-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr2-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr2-v1.o   |   Bin 0 -> 2624 bytes
 .../test-ptr-to-mbr3-output-1.txt             |    20 +
 .../pointer-to-member/test-ptr-to-mbr3-v0.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr3-v0.o   |   Bin 0 -> 2624 bytes
 .../pointer-to-member/test-ptr-to-mbr3-v1.cc  |     6 +
 .../pointer-to-member/test-ptr-to-mbr3-v1.o   |   Bin 0 -> 2664 bytes
 .../test-ptr-to-mbr4-output-1.txt             |    12 +
 .../pointer-to-member/test-ptr-to-mbr4-v0.cc  |     8 +
 .../pointer-to-member/test-ptr-to-mbr4-v0.o   |   Bin 0 -> 2688 bytes
 .../pointer-to-member/test-ptr-to-mbr4-v1.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr4-v1.o   |   Bin 0 -> 2696 bytes
 .../test-ptr-to-mbr5-output-1.txt             |     0
 .../pointer-to-member/test-ptr-to-mbr5-v0.cc  |     8 +
 .../pointer-to-member/test-ptr-to-mbr5-v0.o   |   Bin 0 -> 2640 bytes
 .../pointer-to-member/test-ptr-to-mbr5-v1.cc  |     7 +
 .../pointer-to-member/test-ptr-to-mbr5-v1.o   |   Bin 0 -> 2648 bytes
 .../test-pointer-to-member-1.o.annotated.abi  |    99 +
 .../PR22015-libboost_iostreams.so.abi         |  2729 +-
 .../test-pointer-to-member-1.cc               |    30 +
 .../test-pointer-to-member-1.o                |   Bin 0 -> 4360 bytes
 .../test-pointer-to-member-1.o.abi            |    59 +
 .../test-read-dwarf/test12-pr18844.so.abi     | 24153 ++++++++--------
 tests/test-abidiff-exit.cc                    |    75 +
 tests/test-annotate.cc                        |     5 +
 tests/test-read-dwarf.cc                      |     9 +
 47 files changed, 15415 insertions(+), 13395 deletions(-)
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc
 create mode 100644 tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o
 create mode 100644 tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.cc
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.o
 create mode 100644 tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi

diff --git a/include/abg-comparison.h b/include/abg-comparison.h
index 9155cc54..f6e25e20 100644
--- a/include/abg-comparison.h
+++ b/include/abg-comparison.h
@@ -1416,6 +1416,68 @@ compute_diff(reference_type_def_sptr first,
 	     diff_context_sptr ctxt);
 
 
+class ptr_to_mbr_diff;
+
+/// Typedef of a shared_ptr to @ref ptr_to_mbr_diff
+typedef shared_ptr<ptr_to_mbr_diff> ptr_to_mbr_diff_sptr;
+
+/// The abstraction of a diff between two @ref ptr_to_mbr_type.
+class ptr_to_mbr_diff : public type_diff_base
+{
+  struct priv;
+  std::unique_ptr<priv> priv_;
+
+  ptr_to_mbr_diff()  = default;
+
+protected:
+  ptr_to_mbr_diff(const ptr_to_mbr_type_sptr& first,
+		  const ptr_to_mbr_type_sptr& second,
+		  const diff_sptr&	      member_type_diff,
+		  const diff_sptr&	      containing_type_diff,
+		  diff_context_sptr	      ctxt);
+
+public:
+
+  ptr_to_mbr_type_sptr
+  first_ptr_to_mbr_type() const;
+
+  ptr_to_mbr_type_sptr
+  second_ptr_to_mbr_type() const;
+
+  const diff_sptr
+  member_type_diff() const;
+
+  const diff_sptr
+  containing_type_diff() const;
+
+  virtual bool
+  has_changes() const;
+
+  virtual enum change_kind
+  has_local_changes() const;
+
+  virtual const string&
+  get_pretty_representation() const;
+
+  virtual void
+  report(ostream&, const string& indent = "") const;
+
+  virtual void
+  chain_into_hierarchy();
+
+  virtual ~ptr_to_mbr_diff();
+
+  friend ptr_to_mbr_diff_sptr
+  compute_diff(const ptr_to_mbr_type_sptr& first,
+	       const ptr_to_mbr_type_sptr& second,
+	       diff_context_sptr&		  ctxt);
+}; // end class ptr_to_mbr_diff
+
+ptr_to_mbr_diff_sptr
+compute_diff(const ptr_to_mbr_type_sptr& first,
+	     const ptr_to_mbr_type_sptr& second,
+	     diff_context_sptr&	 ctxt);
+
 class subrange_diff;
 
 /// A convenience typedef for a shared pointer to subrange_diff type.
diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 3687d346..51043af2 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -231,6 +231,10 @@ class reference_type_def;
 /// Convenience typedef for a shared pointer on a @ref reference_type_def
 typedef shared_ptr<reference_type_def> reference_type_def_sptr;
 
+class ptr_to_mbr_type;
+/// Convenience typedef for a shared pointer to a @ref ptr_to_mbr_type
+typedef shared_ptr<ptr_to_mbr_type> ptr_to_mbr_type_sptr;
+
 class array_type_def;
 
 /// Convenience typedef for a shared pointer on a @ref array_type_def
@@ -553,12 +557,21 @@ 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_to_ptr_to_mbr_type(const type_base_sptr&);
+
 pointer_type_def_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);
 
+bool
+is_typedef_of_maybe_qualified_class_or_union_type(const type_base* t);
+
+bool
+is_typedef_of_maybe_qualified_class_or_union_type(const type_base_sptr& t);
+
 reference_type_def*
 is_reference_type(type_or_decl_base*, bool look_through_qualifiers=false);
 
@@ -569,6 +582,14 @@ reference_type_def_sptr
 is_reference_type(const type_or_decl_base_sptr&,
 		  bool look_through_qualifiers=false);
 
+const ptr_to_mbr_type*
+is_ptr_to_mbr_type(const type_or_decl_base*,
+		   bool look_through_qualifiers=false);
+
+ptr_to_mbr_type_sptr
+is_ptr_to_mbr_type(const type_or_decl_base_sptr&,
+		   bool look_through_qualifiers=false);
+
 const type_base*
 is_void_pointer_type(const type_base*);
 
diff --git a/include/abg-ir.h b/include/abg-ir.h
index 8ed8d734..a500762a 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -637,6 +637,12 @@ public:
   const istring_type_base_wptrs_map_type&
   pointer_types() const;
 
+  istring_type_base_wptrs_map_type&
+  ptr_to_mbr_types();
+
+  const istring_type_base_wptrs_map_type&
+  ptr_to_mbr_types() const;
+
   istring_type_base_wptrs_map_type&
   reference_types();
 
@@ -1382,13 +1388,14 @@ protected:
     QUALIFIED_TYPE = 1 << 12,
     POINTER_TYPE = 1 << 13,
     REFERENCE_TYPE = 1 << 14,
-    ARRAY_TYPE = 1 << 15,
-    ENUM_TYPE = 1 << 16,
-    TYPEDEF_TYPE = 1 << 17,
-    CLASS_TYPE = 1 << 18,
-    UNION_TYPE = 1 << 19,
-    FUNCTION_TYPE = 1 << 20,
-    METHOD_TYPE = 1 << 21,
+    POINTER_TO_MEMBER_TYPE = 1 << 15,
+    ARRAY_TYPE = 1 << 16,
+    ENUM_TYPE = 1 << 17,
+    TYPEDEF_TYPE = 1 << 18,
+    CLASS_TYPE = 1 << 19,
+    UNION_TYPE = 1 << 20,
+    FUNCTION_TYPE = 1 << 21,
+    METHOD_TYPE = 1 << 22,
   }; // end enum type_or_decl_kind
 
   enum type_or_decl_kind
@@ -2444,6 +2451,57 @@ operator==(const reference_type_def_sptr&, const reference_type_def_sptr&);
 bool
 operator!=(const reference_type_def_sptr&, const reference_type_def_sptr&);
 
+/// The abstraction of a pointer-to-member type.
+class ptr_to_mbr_type : public virtual type_base,
+			public virtual decl_base
+{
+  struct priv;
+  std::unique_ptr<priv> priv_;
+
+  // Forbidden
+  ptr_to_mbr_type() = delete;
+
+  public:
+  ptr_to_mbr_type(const environment&		env,
+		  const type_base_sptr&	member_type,
+		  const type_base_sptr&	containing_type,
+		  size_t			size_in_bits,
+		  size_t			alignment_in_bits,
+		  const location&		locus);
+
+  const type_base_sptr&
+  get_member_type() const;
+
+  const type_base_sptr&
+  get_containing_type() const;
+
+  bool
+  operator==(const ptr_to_mbr_type&) const;
+
+  virtual bool
+  operator==(const type_base&) const;
+
+  virtual bool
+  operator==(const decl_base&) const;
+
+  virtual void
+  get_qualified_name(interned_string& qualified_name,
+		     bool internal = false) const;
+
+  virtual const interned_string&
+  get_qualified_name(bool internal = false) const;
+
+  virtual bool
+  traverse(ir_node_visitor& v);
+
+  virtual ~ptr_to_mbr_type();
+}; // end class ptr_to_mbr_type
+
+bool
+equals(const ptr_to_mbr_type&,
+       const ptr_to_mbr_type&,
+       change_kind*);
+
 bool
 equals(const array_type_def&, const array_type_def&, change_kind*);
 
@@ -4925,6 +4983,9 @@ public:
   virtual bool visit_begin(reference_type_def*);
   virtual bool visit_end(reference_type_def*);
 
+  virtual bool visit_begin(ptr_to_mbr_type*);
+  virtual bool visit_end(ptr_to_mbr_type*);
+
   virtual bool visit_begin(array_type_def*);
   virtual bool visit_end(array_type_def*);
 
diff --git a/include/abg-reporter.h b/include/abg-reporter.h
index 8104c653..a701d9d7 100644
--- a/include/abg-reporter.h
+++ b/include/abg-reporter.h
@@ -32,6 +32,7 @@ class qualified_type_diff;
 class distinct_diff;
 class pointer_diff;
 class reference_diff;
+class ptr_to_mbr_diff;
 class subrange_diff;
 class array_diff;
 class base_diff;
@@ -89,6 +90,10 @@ public:
   report(const reference_diff& d, std::ostream& out,
 	 const std::string& indent = "") const = 0;
 
+  virtual void
+  report(const ptr_to_mbr_diff& d, std::ostream& out,
+	 const std::string& indent = "") const = 0;
+
   virtual void
   report(const array_diff& d, std::ostream& out,
 	 const std::string& indent = "") const = 0;
@@ -200,6 +205,15 @@ public:
   report(const reference_diff& d, std::ostream& out,
 	 const std::string& indent = "") const;
 
+  bool
+  report_local_ptr_to_mbr_type_changes(const ptr_to_mbr_diff& d,
+				       std::ostream& out,
+				       const std::string& indent = "") const;
+
+  virtual void
+  report(const ptr_to_mbr_diff& d, std::ostream& out,
+	 const std::string& indent = "") const;
+
   virtual void
   report(const fn_parm_diff& d, std::ostream& out,
 	 const std::string& indent = "") const;
@@ -291,6 +305,10 @@ public:
   report(const reference_diff& d, std::ostream& out,
 	 const std::string& indent = "") const;
 
+  virtual void
+  report(const ptr_to_mbr_diff& d, std::ostream& out,
+	 const std::string& indent = "") const;
+
   virtual void
   report(const fn_parm_diff& d, std::ostream& out,
 	 const std::string& indent = "") const;
diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h
index 9802e78f..3f86db5e 100644
--- a/src/abg-comparison-priv.h
+++ b/src/abg-comparison-priv.h
@@ -443,6 +443,19 @@ struct reference_diff::priv
   {}
 };//end struct reference_diff::priv
 
+/// The private data of the @ref ptr_to_mbr_diff type.
+struct ptr_to_mbr_diff::priv
+{
+  diff_sptr member_type_diff_;
+  diff_sptr containing_type_diff_;
+
+  priv(const diff_sptr& member_type_diff,
+       const diff_sptr& containing_type_diff)
+    : member_type_diff_(member_type_diff),
+      containing_type_diff_(containing_type_diff)
+  {}
+};//end ptr_to_mbr_diff::priv
+
 struct qualified_type_diff::priv
 {
   diff_sptr underlying_type_diff;
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 8a705c54..fdd2a688 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -3041,6 +3041,7 @@ compute_diff_for_types(const type_or_decl_base_sptr& first,
    ||(d = try_to_diff<class_decl>(f, s,ctxt))
    ||(d = try_to_diff<pointer_type_def>(f, s, ctxt))
    ||(d = try_to_diff<reference_type_def>(f, s, ctxt))
+   ||(d = try_to_diff<ptr_to_mbr_type>(f, s, ctxt))
    ||(d = try_to_diff<array_type_def::subrange_type>(f, s, ctxt))
    ||(d = try_to_diff<array_type_def>(f, s, ctxt))
    ||(d = try_to_diff<qualified_type_def>(f, s, ctxt))
@@ -4143,6 +4144,166 @@ compute_diff(reference_type_def_sptr	first,
 }
 // </reference_type_def>
 
+// <ptr_to_mbr_diff stuff>
+
+
+/// Constructor of @ref ptr_to_mbr_diff.
+///
+/// @param first the first pointer-to-member subject of the diff.
+///
+/// @param second the second pointer-to-member subject of the diff.
+///
+/// @param member_type_diff the diff node carrying changes to the
+/// member type of the pointer-to-member we are considering.
+///
+/// @param containing_type_diff the diff node carrying changes to the
+/// containing type of the pointer-to-member we are considering.
+///
+/// @param ctxt the context of the diff we are considering.
+ptr_to_mbr_diff::ptr_to_mbr_diff(const ptr_to_mbr_type_sptr& first,
+				 const ptr_to_mbr_type_sptr& second,
+				 const diff_sptr&	     member_type_diff,
+				 const diff_sptr&	     containing_type_diff,
+				 diff_context_sptr	     ctxt)
+  : type_diff_base(first, second, ctxt),
+    priv_(new priv(member_type_diff, containing_type_diff))
+{}
+
+/// Getter of the first pointer-to-member subject of the current diff
+/// node.
+///
+/// @return the first pointer-to-member subject of the current diff
+/// node.
+ptr_to_mbr_type_sptr
+ptr_to_mbr_diff::first_ptr_to_mbr_type() const
+{return dynamic_pointer_cast<ptr_to_mbr_type>(first_subject());}
+
+/// Getter of the second pointer-to-member subject of the current diff
+/// node.
+///
+/// @return the second pointer-to-member subject of the current diff
+/// node.
+ptr_to_mbr_type_sptr
+ptr_to_mbr_diff::second_ptr_to_mbr_type() const
+{return dynamic_pointer_cast<ptr_to_mbr_type>(second_subject());}
+
+/// Getter of the diff node carrying changes to the member type of
+/// first subject of the current diff node.
+///
+/// @return The diff node carrying changes to the member type of first
+/// subject of the current diff node.
+const diff_sptr
+ptr_to_mbr_diff::member_type_diff() const
+{return priv_->member_type_diff_;}
+
+/// Getter of the diff node carrying changes to the containing type of
+/// first subject of the current diff node.
+///
+/// @return The diff node carrying changes to the containing type of
+/// first subject of the current diff node.
+const diff_sptr
+ptr_to_mbr_diff::containing_type_diff() const
+{return priv_->containing_type_diff_;}
+
+/// Test whether the current diff node carries any change.
+///
+/// @return true iff the current diff node carries any change.
+bool
+ptr_to_mbr_diff::has_changes() const
+{
+  return first_ptr_to_mbr_type() != second_ptr_to_mbr_type();
+}
+
+/// Test whether the current diff node carries any local change.
+///
+/// @return true iff the current diff node carries any local change.
+enum change_kind
+ptr_to_mbr_diff::has_local_changes() const
+{
+  ir::change_kind k = ir::NO_CHANGE_KIND;
+  if (!equals(*first_ptr_to_mbr_type(), *second_ptr_to_mbr_type(), &k))
+    return k & ir::ALL_LOCAL_CHANGES_MASK;
+  return ir::NO_CHANGE_KIND;
+}
+
+/// Get the pretty representation of the current @ref ptr_to_mbr_diff
+/// node.
+///
+/// @return the pretty representation of the current diff node.
+const string&
+ptr_to_mbr_diff::get_pretty_representation() const
+{
+  if (diff::priv_->pretty_representation_.empty())
+    {
+      std::ostringstream o;
+      o << "ptr_to_mbr_diff["
+	<< first_subject()->get_pretty_representation()
+	<< ", "
+	<< second_subject()->get_pretty_representation()
+	<< "]";
+      diff::priv_->pretty_representation_ = o.str();
+    }
+  return diff::priv_->pretty_representation_;
+}
+
+void
+ptr_to_mbr_diff::report(ostream& out, const string& indent) const
+{
+  context()->get_reporter()->report(*this, out, indent);
+}
+
+/// Populate the vector of children node of the @ref diff base type
+/// sub-object of this instance of @ref ptr_to_mbr_diff.
+///
+/// The children node can then later be retrieved using
+/// diff::children_node().
+void
+ptr_to_mbr_diff::chain_into_hierarchy()
+{
+  append_child_node(member_type_diff());
+  append_child_node(containing_type_diff());
+}
+
+/// Destructor of @ref ptr_to_mbr_diff.
+ptr_to_mbr_diff::~ptr_to_mbr_diff()
+{
+}
+
+/// Compute the diff between two @ref ptr_to_mbr_type types.
+///
+/// Note that the two types must have been created in the same @ref
+/// environment, otherwise, this function aborts.
+///
+/// @param first the first pointer-to-member type to consider for the diff.
+///
+/// @param second the second pointer-to-member type to consider for the diff.
+///
+/// @param ctxt the diff context to use.
+ptr_to_mbr_diff_sptr
+compute_diff(const ptr_to_mbr_type_sptr& first,
+	     const ptr_to_mbr_type_sptr& second,
+	     diff_context_sptr&	 ctxt)
+{
+  diff_sptr member_type_diff =
+    compute_diff(is_type(first->get_member_type()),
+		 is_type(second->get_member_type()),
+		 ctxt);
+
+  diff_sptr containing_type_diff =
+    compute_diff(is_type(first->get_containing_type()),
+		 is_type(second->get_containing_type()),
+		 ctxt);
+
+  ptr_to_mbr_diff_sptr result(new ptr_to_mbr_diff(first, second,
+						  member_type_diff,
+						  containing_type_diff,
+						  ctxt));
+  ctxt->initialize_canonical_diff(result);
+  return result;
+}
+
+// </ptr_to_mbr_diff stuff>
+
 // <qualified_type_diff stuff>
 
 /// Populate the vector of children node of the @ref diff base type
diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index c71f8d56..0b317fac 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -522,6 +522,100 @@ default_reporter::report(const reference_diff& d, ostream& out,
       }
 }
 
+/// Report the local changes carried by a @ref ptr_to_mbr_diff diff
+/// node.
+///
+/// This is a subroutine of the method default_reporter::report() that
+/// emits change report for @ref ptr_to_mbr_diff node.
+///
+/// @param d the diff node to consider
+///
+/// @param out the output stream to emit the report to.
+///
+/// @param indent the indentation string (spaces) to use in the
+/// report.
+///
+/// @return truf iff a report was emitted to the output stream.
+bool
+default_reporter::report_local_ptr_to_mbr_type_changes(const ptr_to_mbr_diff& d,
+						       std::ostream& out,
+						       const std::string& indent) const
+{
+  if (!d.to_be_reported())
+    return false;
+
+  ptr_to_mbr_type_sptr f = d.first_ptr_to_mbr_type(),
+    s = d.second_ptr_to_mbr_type();
+
+  enum change_kind k = ir::NO_CHANGE_KIND;
+  equals(*d.first_ptr_to_mbr_type(), *d.second_ptr_to_mbr_type(), &k);
+
+  if (k & ALL_LOCAL_CHANGES_MASK)
+    {
+      string f_repr = f->get_pretty_representation(),
+	s_repr = s->get_pretty_representation();
+
+      out << indent;
+      out << "pointer-to-member type changed from: '"
+	  << f_repr << " to: '"<< s_repr << "'\n";
+      return true;
+    }
+  return false;
+}
+
+
+/// Emit a textual report about the changes carried by a @ref
+/// ptr_to_mbr_diff diff node.
+///
+/// @param out the output stream to emit the report to.
+///
+/// @param indent the indentation string to use for the report.
+void
+default_reporter::report(const ptr_to_mbr_diff& d,
+			 std::ostream& out,
+			 const std::string& indent) const
+{
+  if (!d.to_be_reported())
+    return;
+
+  report_local_ptr_to_mbr_type_changes(d, out, indent);
+
+  if (diff_sptr dif = d.member_type_diff())
+    {
+      RETURN_IF_BEING_REPORTED_OR_WAS_REPORTED_EARLIER2
+	(dif,"data member type of pointer-to-member");
+      if (dif->to_be_reported())
+	{
+	  out << indent
+	      << "in data member type '"
+	      << dif->first_subject()->get_pretty_representation()
+	      << "' of pointed-to-member type '"
+	      << d.first_ptr_to_mbr_type()->get_pretty_representation()
+	      << "'";
+	  report_loc_info(dif->second_subject(), *d.context(), out);
+	  out << ":\n";
+	  dif->report(out, indent + "  ");
+	}
+    }
+  if (diff_sptr dif = d.containing_type_diff())
+    {
+      RETURN_IF_BEING_REPORTED_OR_WAS_REPORTED_EARLIER2
+	(dif,"containing type of pointer-to-member");
+      if (dif->to_be_reported())
+	{
+	  out << indent
+	      << "in containing type '"
+	      << dif->first_subject()->get_pretty_representation()
+	      << "' of pointed-to-member type '"
+	      << d.first_ptr_to_mbr_type()->get_pretty_representation()
+	      << "'";
+	  report_loc_info(dif->second_subject(), *d.context(), out);
+	  out << ":\n";
+	  dif->report(out, indent + "  ");
+	}
+    }
+}
+
 /// Emit a textual report about the a @ref fn_parm_diff instance.
 ///
 /// @param d the @ref fn_parm_diff to consider.
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 0cf1ce14..15a35edf 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -13994,6 +13994,81 @@ build_reference_type(reader&	rdr,
   return result;
 }
 
+/// Build an instance of @ref ptr_to_mbr_type from a DIE of tag
+/// DW_TAG_ptr_to_member_type.
+///
+/// @param the DWARF reader touse.
+///
+/// @param the DIE to consider.  It must carry the tag
+/// DW_TAG_ptr_to_member_type.
+///
+/// @param called_from_public_decl true if this function was called
+/// from a context where either a public function or a public variable
+/// is being built.
+///
+/// @param where_offset the offset of the DIE where we are "logically"
+/// positionned at, in the DIE tree.  This is useful when @p die is
+/// e.g, DW_TAG_partial_unit that can be included in several places in
+/// the DIE tree.
+///
+/// @return a pointer to the resulting @ref ptr_to_mbr_type.
+static ptr_to_mbr_type_sptr
+build_ptr_to_mbr_type(reader&		rdr,
+		      Dwarf_Die*	die,
+		      bool		called_from_public_decl,
+		      size_t		where_offset)
+{
+  ptr_to_mbr_type_sptr result;
+
+  if (!die)
+    return result;
+
+  unsigned tag = dwarf_tag(die);
+  if (tag != DW_TAG_ptr_to_member_type)
+    return result;
+
+  Dwarf_Die data_member_type_die, containing_type_die;
+
+  if (!die_die_attribute(die, DW_AT_type, data_member_type_die)
+      || !die_die_attribute(die, DW_AT_containing_type, containing_type_die))
+    return result;
+
+  type_or_decl_base_sptr data_member_type =
+    build_ir_node_from_die(rdr, &data_member_type_die,
+			   called_from_public_decl, where_offset);
+  if (!data_member_type)
+    return result;
+
+  type_or_decl_base_sptr containing_type =
+    build_ir_node_from_die(rdr, &containing_type_die,
+			   called_from_public_decl, where_offset);
+  if (!containing_type)
+    return result;
+
+  if (!is_typedef_of_maybe_qualified_class_or_union_type
+      (is_type(containing_type)))
+    return result;
+
+  if (type_base_sptr t = rdr.lookup_type_from_die(die))
+    {
+      result = is_ptr_to_mbr_type(t);
+      ABG_ASSERT(result);
+      return result;
+    }
+
+  uint64_t size_in_bits = rdr.cur_transl_unit()->get_address_size();
+
+  result.reset(new ptr_to_mbr_type(data_member_type->get_environment(),
+				   is_type(data_member_type),
+				   is_type(containing_type),
+				   size_in_bits,
+				   /*alignment=*/0,
+				   location()));
+
+  rdr.associate_die_to_type(die, result, where_offset);
+  return result;
+}
+
 /// Build a subroutine type from a DW_TAG_subroutine_type DIE.
 ///
 /// @param rdr the DWARF reader to consider.
@@ -15511,6 +15586,20 @@ build_ir_node_from_die(reader&	rdr,
       }
       break;
 
+    case DW_TAG_ptr_to_member_type:
+      {
+	ptr_to_mbr_type_sptr p =
+	  build_ptr_to_mbr_type(rdr, die, called_from_public_decl,
+				where_offset);
+	if (p)
+	  {
+	    result =
+	      add_decl_to_scope(p, rdr.cur_transl_unit()->get_global_scope());
+	    maybe_canonicalize_type(p, rdr);
+	  }
+      }
+      break;
+
     case DW_TAG_const_type:
     case DW_TAG_volatile_type:
     case DW_TAG_restrict_type:
@@ -15707,8 +15796,6 @@ build_ir_node_from_die(reader&	rdr,
       break;
     case DW_TAG_file_type:
       break;
-    case DW_TAG_ptr_to_member_type:
-      break;
     case DW_TAG_thrown_type:
       break;
     case DW_TAG_interface_type:
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 06cfe558..56d71465 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -231,6 +231,16 @@ pointer_declaration_name(const type_base_sptr& ptr,
 			 const string& variable_name,
 			 bool qualified, bool internal);
 
+static interned_string
+ptr_to_mbr_declaration_name(const ptr_to_mbr_type* ptr,
+			    const string& variable_name,
+			    bool qualified, bool internal);
+
+static interned_string
+ptr_to_mbr_declaration_name(const ptr_to_mbr_type_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,
@@ -264,6 +274,22 @@ static string
 add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
 				     const string& input, bool qualified,
 				     bool internal);
+
+static string
+add_outer_ptr_to_mbr_type_expr(const ptr_to_mbr_type* p,
+			       const  string& input, bool qualified,
+			       bool internal);
+
+static string
+add_outer_ptr_to_mbr_type_expr(const ptr_to_mbr_type_sptr& p,
+			       const  string& input, bool qualified,
+			       bool internal);
+
+static string
+add_outer_pointer_to_ptr_to_mbr_type_expr(const type_base* p,
+					  const  string& input,
+					  bool qualified, bool internal);
+
 void
 push_composite_type_comparison_operands(const type_base& left,
 					const type_base& right);
@@ -540,6 +566,7 @@ struct type_maps::priv
   mutable istring_type_base_wptrs_map_type	typedef_types_;
   mutable istring_type_base_wptrs_map_type	qualified_types_;
   mutable istring_type_base_wptrs_map_type	pointer_types_;
+  mutable istring_type_base_wptrs_map_type	ptr_to_mbr_types_;
   mutable istring_type_base_wptrs_map_type	reference_types_;
   mutable istring_type_base_wptrs_map_type	array_types_;
   mutable istring_type_base_wptrs_map_type	subrange_types_;
@@ -660,6 +687,20 @@ istring_type_base_wptrs_map_type&
 type_maps::pointer_types()
 {return priv_->pointer_types_;}
 
+/// Getter for the map that associates the name of a pointer-to-member
+/// type to the vector of instances of @ref ptr_to_mbr_type_sptr that
+/// represents that type.
+istring_type_base_wptrs_map_type&
+type_maps::ptr_to_mbr_types()
+{return priv_->ptr_to_mbr_types_;}
+
+/// Getter for the map that associates the name of a pointer-to-member
+/// type to the vector of instances of @ref ptr_to_mbr_type_sptr that
+/// represents that type.
+const istring_type_base_wptrs_map_type&
+type_maps::ptr_to_mbr_types() const
+{return priv_->ptr_to_mbr_types_;}
+
 /// Getter for the map that associates the name of a pointer type to
 /// the vector of instances of @ref pointer_type_def_sptr that
 /// represents that type.
@@ -10584,7 +10625,10 @@ is_anonymous_type(const type_base_sptr& t)
 bool
 is_npaf_type(const type_base_sptr& t)
 {
-  if (!(is_pointer_type(t) || is_array_type(t) || is_function_type(t)))
+  if (!(is_pointer_type(t)
+	|| is_array_type(t)
+	|| is_function_type(t)
+	|| is_ptr_to_mbr_type(t)))
     return true;
   return false;
 }
@@ -11173,6 +11217,23 @@ is_pointer_to_npaf_type(const type_base_sptr& t)
   return pointer_type_def_sptr();
 }
 
+/// Test if we are looking at a pointer to pointer to member type.
+///
+/// @param t the type to consider.
+///
+/// @return the @ref pointer_type_def_sptr type iff @p t is a pointer
+/// to pointer to member type.
+pointer_type_def_sptr
+is_pointer_to_ptr_to_mbr_type(const type_base_sptr& t)
+{
+  if (pointer_type_def_sptr p = is_pointer_type(t))
+    {
+      if (is_ptr_to_mbr_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.
 ///
@@ -11195,6 +11256,43 @@ is_typedef_ptr_or_ref_to_decl_only_class_or_union_type(const type_base* t)
   return false;
 }
 
+/// Test if a type is a typedef of a class or union type, or a typedef
+/// of a qualified class or union type.
+///
+/// Note that if the type is directly a class or union type, the
+/// function returns true as well.
+///
+/// @param t the type to consider.
+///
+/// @return true iff @p t is a typedef of a class or union type, or a
+/// typedef of a qualified class or union type.
+bool
+is_typedef_of_maybe_qualified_class_or_union_type(const type_base* t)
+{
+  if (!t)
+    return false;
+
+  t = peel_qualified_or_typedef_type(t);
+  if (is_class_or_union_type(t))
+    return true;
+
+return false;
+}
+
+/// Test if a type is a typedef of a class or union type, or a typedef
+/// of a qualified class or union type.
+///
+/// Note that if the type is directly a class or union type, the
+/// function returns true as well.
+///
+/// @param t the type to consider.
+///
+/// @return true iff @p t is a typedef of a class or union type, or a
+/// typedef of a qualified class or union type.
+bool
+is_typedef_of_maybe_qualified_class_or_union_type(const type_base_sptr& t)
+{return is_typedef_of_maybe_qualified_class_or_union_type(t.get());}
+
 /// Test whether a type is a reference_type_def.
 ///
 /// @param t the type to test.
@@ -11259,6 +11357,42 @@ is_reference_type(const type_or_decl_base_sptr& t,
   return dynamic_pointer_cast<reference_type_def>(type);
 }
 
+/// Test whether a type is a @ref ptr_to_mbr_type.
+///
+/// @param t the type to test.
+///
+/// @return the @ref ptr_to_mbr_type* if @p t is a @ref
+/// ptr_to_mbr_type type, null otherwise.
+const ptr_to_mbr_type*
+is_ptr_to_mbr_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 ptr_to_mbr_type*>(type);
+}
+
+/// Test whether a type is a @ref ptr_to_mbr_type_sptr.
+///
+/// @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
+/// ptr_to_mbr_type..
+///
+/// @return the @ref ptr_to_mbr_type_sptr if @p t is a @ref
+/// ptr_to_mbr_type type, null otherwise.
+ptr_to_mbr_type_sptr
+is_ptr_to_mbr_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<ptr_to_mbr_type>(type);
+}
+
 /// Test if a type is equivalent to a pointer to void type.
 ///
 /// Note that this looks trough typedefs or CV qualifiers to look for
@@ -14518,6 +14652,39 @@ maybe_update_types_lookup_map(const pointer_type_def_sptr& pointer_type)
     }
 }
 
+/// Update the map that associates the fully qualified name of a
+/// pointer-to-member type with the type itself.
+///
+/// The per-translation unit type map is updated if no type with this
+/// name was already existing in that map.
+///
+/// If no type with this name did already exist in the per-corpus type
+/// map, then that per-corpus type map is updated. Otherwise, that
+/// type is erased from that per-corpus map.
+///
+/// @param ptr_to_mbr_type the type to consider.
+void
+maybe_update_types_lookup_map(const ptr_to_mbr_type_sptr& ptr_to_member)
+{
+  if (translation_unit *tu = ptr_to_member->get_translation_unit())
+    maybe_update_types_lookup_map<ptr_to_mbr_type>
+      (ptr_to_member, tu->get_types().ptr_to_mbr_types());
+
+  if (corpus *type_corpus = ptr_to_member->get_corpus())
+    {
+      maybe_update_types_lookup_map<ptr_to_mbr_type>
+	(ptr_to_member,
+	 type_corpus->priv_->get_types().ptr_to_mbr_types());
+
+      if (corpus *group = type_corpus->get_group())
+	{
+	  maybe_update_types_lookup_map<ptr_to_mbr_type>
+	    (ptr_to_member,
+	     group->priv_->get_types().ptr_to_mbr_types());
+	}
+    }
+}
+
 /// Update the map that associates the fully qualified name of a
 /// reference type with the type itself.
 ///
@@ -14703,6 +14870,8 @@ maybe_update_types_lookup_map(const decl_base_sptr& decl)
     maybe_update_types_lookup_map(qualified_type);
   else if (pointer_type_def_sptr pointer_type = is_pointer_type(decl))
     maybe_update_types_lookup_map(pointer_type);
+  else if (ptr_to_mbr_type_sptr ptr_to_member = is_ptr_to_mbr_type(decl))
+    maybe_update_types_lookup_map(ptr_to_member);
   else if (reference_type_def_sptr reference_type = is_reference_type(decl))
     maybe_update_types_lookup_map(reference_type);
   else if (array_type_def_sptr array_type = is_array_type(decl))
@@ -18111,6 +18280,280 @@ operator!=(const reference_type_def_sptr& l, const reference_type_def_sptr& r)
 
 // </reference_type_def definitions>
 
+// <ptr_to_mbr_type definitions>
+
+/// The private data type of @ref ptr_to_mbr_type.
+struct ptr_to_mbr_type::priv
+{
+  // The type of the data member this pointer-to-member-type
+  // designates.
+  type_base_sptr dm_type_;
+  // The class (or typedef to potentially qualified class) containing
+  // the data member this pointer-to-member-type designates.
+  type_base_sptr containing_type_;
+  interned_string internal_qualified_name_;
+  interned_string temp_internal_qualified_name_;
+
+  priv()
+  {}
+
+  priv(const type_base_sptr& dm_type, const type_base_sptr& containing_type)
+    :  dm_type_(dm_type),
+       containing_type_(containing_type)
+  {}
+};// end struct ptr_to_mbr_type::priv
+
+/// A constructor for a @ref ptr_to_mbr_type type.
+///
+/// @param env the environment to construct the @ref ptr_to_mbr_type in.
+///
+/// @param member_type the member type of the of the @ref
+/// ptr_to_mbr_type to construct.
+///
+/// @param containing_type the containing type of the @ref
+/// ptr_to_mbr_type to construct.
+///
+/// @param size_in_bits the size (in bits) of the resulting type.
+///
+/// @param alignment_in_bits the alignment (in bits) of the resulting
+/// type.
+///
+/// @param locus the source location of the definition of the
+/// resulting type.
+ptr_to_mbr_type::ptr_to_mbr_type(const environment&		env,
+				 const type_base_sptr&		member_type,
+				 const type_base_sptr&		containing_type,
+				 size_t			size_in_bits,
+				 size_t			alignment_in_bits,
+				 const location&		locus)
+  : type_or_decl_base(env,
+		      POINTER_TO_MEMBER_TYPE
+		      | ABSTRACT_TYPE_BASE
+		      | ABSTRACT_DECL_BASE),
+    type_base(env, size_in_bits, alignment_in_bits),
+    decl_base(env, "", locus, ""),
+    priv_(new priv(member_type, containing_type))
+{
+  runtime_type_instance(this);
+  ABG_ASSERT(member_type);
+  ABG_ASSERT(containing_type);
+  interned_string name = ptr_to_mbr_declaration_name(this, "",
+						     /*qualified=*/true,
+						     /*internal=*/false);
+  set_name(name);
+}
+
+/// Getter of the member type of the current @ref ptr_to_mbr_type.
+///
+/// @return the type of the member referred to by the current
+/// @ptr_to_mbr_type.
+const type_base_sptr&
+ptr_to_mbr_type::get_member_type() const
+{return priv_->dm_type_;}
+
+/// Getter of the type containing the member pointed-to by the current
+/// @ref ptr_to_mbr_type.
+///
+/// @return the type containing the member pointed-to by the current
+/// @ref ptr_to_mbr_type.
+const type_base_sptr&
+ptr_to_mbr_type::get_containing_type() const
+{return priv_->containing_type_;}
+
+/// Equality operator for the current @ref ptr_to_mbr_type.
+///
+///@param o the other instance of @ref ptr_to_mbr_type to compare the
+///current instance to.
+///
+/// @return true iff the current @ref ptr_to_mbr_type equals @p o.
+bool
+ptr_to_mbr_type::operator==(const decl_base& o) const
+{
+  const ptr_to_mbr_type* other =
+    dynamic_cast<const ptr_to_mbr_type*>(&o);
+  if (!other)
+    return false;
+  return try_canonical_compare(this, other);
+}
+
+/// Equality operator for the current @ref ptr_to_mbr_type.
+///
+///@param o the other instance of @ref ptr_to_mbr_type to compare the
+///current instance to.
+///
+/// @return true iff the current @ref ptr_to_mbr_type equals @p o.
+bool
+ptr_to_mbr_type::operator==(const type_base& o) const
+{
+  const decl_base* other = dynamic_cast<const decl_base*>(&o);
+  if (!other)
+    return false;
+  return *this == *other;
+}
+
+/// Equality operator for the current @ref ptr_to_mbr_type.
+///
+///@param o the other instance of @ref ptr_to_mbr_type to compare the
+///current instance to.
+///
+/// @return true iff the current @ref ptr_to_mbr_type equals @p o.
+bool
+ptr_to_mbr_type::operator==(const ptr_to_mbr_type& o) const
+{
+  const decl_base* other = dynamic_cast<const decl_base*>(&o);
+  if (!other)
+    return false;
+  return *this == *other;
+}
+
+/// Get the qualified name for the current @ref ptr_to_mbr_type.
+///
+/// @param qualified_name out parameter.  This is set to the name of
+/// the current @ref ptr_to_mbr_type.
+///
+/// @param internal if this is true, then the qualified name is for
+/// the purpose of type canoicalization.
+void
+ptr_to_mbr_type::get_qualified_name(interned_string& qualified_name,
+				    bool internal) const
+{qualified_name = get_qualified_name(internal);}
+
+/// Get the qualified name for the current @ref ptr_to_mbr_type.
+///
+/// @param internal if this is true, then the qualified name is for
+/// the purpose of type canoicalization.
+///
+/// @return the qualified name for the current @ref ptr_to_mbr_type.
+const interned_string&
+ptr_to_mbr_type::get_qualified_name(bool internal) const
+{
+  type_base_sptr member_type = get_member_type();
+  type_base_sptr containing_type = get_containing_type();
+
+  if (internal)
+    {
+      if (get_canonical_type())
+	{
+	  if (priv_->internal_qualified_name_.empty())
+	    priv_->internal_qualified_name_ =
+	      ptr_to_mbr_declaration_name(this, "",
+					  /*qualified=*/true,
+					  internal);
+	  return  priv_->internal_qualified_name_;
+	}
+      else
+	{
+	  priv_->temp_internal_qualified_name_ =
+	    ptr_to_mbr_declaration_name(this, "", /*qualified=*/true, internal);
+	  return priv_->temp_internal_qualified_name_;
+	}
+    }
+  else
+    {
+      set_qualified_name
+	(ptr_to_mbr_declaration_name(this, "", /*qualified=*/true,
+				     /*internal=*/false));
+      return decl_base::peek_qualified_name();
+    }
+}
+
+/// This implements the ir_traversable_base::traverse pure virtual
+/// function for @ref ptr_to_mbr_type.
+///
+/// @param v the visitor used on the current instance.
+///
+/// @return true if the entire IR node tree got traversed, false
+/// otherwise.
+bool
+ptr_to_mbr_type::traverse(ir_node_visitor& v)
+{
+  if (v.type_node_has_been_visited(this))
+    return true;
+
+  if (visiting())
+    return true;
+
+  if (v.visit_begin(this))
+    {
+      visiting(true);
+      if (type_base_sptr t = get_member_type())
+	t->traverse(v);
+
+      if (type_base_sptr t = get_containing_type())
+	t->traverse(v);
+      visiting(false);
+    }
+
+  bool result = v.visit_end(this);
+  v.mark_type_node_as_visited(this);
+  return result;
+}
+
+/// Desctructor for @ref ptr_to_mbr_type.
+ptr_to_mbr_type::~ptr_to_mbr_type()
+{}
+
+
+/// Compares two instances of @ref ptr_to_mbr_type.
+///
+/// If the two intances are different, set a bitfield to give some
+/// insight about the kind of differences there are.
+///
+/// @param l the first artifact of the comparison.
+///
+/// @param r the second artifact of the comparison.
+///
+/// @param k a pointer to a bitfield that gives information about the
+/// kind of changes there are between @p l and @p r.  This one is set
+/// iff @p k is non-null and the function returns false.
+///
+/// Please note that setting k to a non-null value does have a
+/// negative performance impact because even if @p l and @p r are not
+/// equal, the function keeps up the comparison in order to determine
+/// the different kinds of ways in which they are different.
+///
+/// @return true if @p l equals @p r, false otherwise.
+bool
+equals(const ptr_to_mbr_type& l, const ptr_to_mbr_type& r, change_kind* k)
+{
+  bool result = true;
+
+  if (!(l.decl_base::operator==(r)))
+    {
+      result = false;
+      if (k)
+	*k |= LOCAL_TYPE_CHANGE_KIND;
+      else
+	result = false;
+    }
+
+  if (l.get_member_type() != r.get_member_type())
+    {
+      if (k)
+	{
+	  if (!types_have_similar_structure(&l, &r))
+	    *k |= LOCAL_TYPE_CHANGE_KIND;
+	  *k |= SUBTYPE_CHANGE_KIND;
+	}
+      result = false;
+    }
+
+  if (l.get_containing_type() != r.get_containing_type())
+    {
+      if (k)
+	{
+	  if (!types_have_similar_structure(&l, &r))
+	    *k |= LOCAL_TYPE_CHANGE_KIND;
+	  *k |= SUBTYPE_CHANGE_KIND;
+	}
+      result = false;
+    }
+
+  ABG_RETURN(result);
+}
+
+// </ptr_to_mbr_type definitions>
+
 // <array_type_def definitions>
 
 // <array_type_def::subrange_type>
@@ -20532,7 +20975,8 @@ var_decl::get_pretty_representation(bool internal, bool qualified_name) const
   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))
+      || is_reference_type(type, /*look_through_qualifiers=*/true)
+      || is_ptr_to_mbr_type(type, /*look_through_qualifiers=*/true))
     {
       string name;
       if (member_of_anonymous_class || !qualified_name)
@@ -20556,6 +21000,10 @@ var_decl::get_pretty_representation(bool internal, bool qualified_name) const
 	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 if (ptr_to_mbr_type_sptr t = is_ptr_to_mbr_type(type))
+	result += ptr_to_mbr_declaration_name(t, name,
+					      qualified_name,
+					      internal);
     }
   else
     {
@@ -27609,6 +28057,18 @@ types_have_similar_structure(const type_base* first,
 					  /*indirect_type=*/true);
     }
 
+  // Peel off matching pointer-to-member types.
+  if (const ptr_to_mbr_type* ty1 = is_ptr_to_mbr_type(first))
+    {
+      const ptr_to_mbr_type* ty2 = is_ptr_to_mbr_type(second);
+      return (types_have_similar_structure(ty1->get_member_type(),
+					   ty2->get_member_type(),
+					   /*indirect_type=*/true)
+	      && types_have_similar_structure(ty1->get_containing_type(),
+					      ty2->get_containing_type(),
+					      /*indirect_type=*/true));
+    }
+
   if (const type_decl* ty1 = is_type_decl(first))
     {
       const type_decl* ty2 = is_type_decl(second);
@@ -28251,6 +28711,218 @@ add_outer_pointer_to_array_type_expr(const type_base_sptr& pointer_to_ar,
 {return add_outer_pointer_to_array_type_expr(pointer_to_ar.get(),
 					     input, qualified, internal);}
 
+/// When constructing the name of a pointer to mebmer 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 member function (of a containing struct
+///    X) taking a char parameter and returning an int".
+///
+/// It's going to look like:
+///
+///   int (X::* 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 "(X::* 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 member type expression".
+///
+/// This is a sub-routine of @ref ptr_to_mbr_declaration_name().
+///
+/// @param p the pointer to member type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-member 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 member type.
+static string
+add_outer_ptr_to_mbr_type_expr(const ptr_to_mbr_type* p,
+			       const  string& input, bool qualified,
+			       bool internal)
+{
+  if (!p)
+    return "";
+
+  std::ostringstream left, right, inner;
+  string containing_type_name = get_type_name(p->get_containing_type(),
+					      qualified, internal);
+  type_base_sptr mbr_type = p->get_member_type();
+  string result;
+  if (function_type_sptr fn_type = is_function_type(mbr_type))
+    {
+      inner << "(" << containing_type_name << "::*" << input << ")";
+      stream_pretty_representation_of_fn_parms(*fn_type, right,
+					       qualified, internal);
+      type_base_sptr return_type = fn_type->get_return_type();
+      if (is_npaf_type(return_type)
+	  || !(is_pointer_to_function_type(return_type)
+	       || is_pointer_to_array_type(return_type)
+	       || is_pointer_to_ptr_to_mbr_type(return_type)
+	       || is_ptr_to_mbr_type(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_type(return_type))
+	{
+	  string inner_str = inner.str() + right.str();
+	  result = pointer_declaration_name(p, inner_str, qualified, internal);
+	}
+      else if (ptr_to_mbr_type_sptr p = is_ptr_to_mbr_type(return_type))
+	{
+	  string inner_str = inner.str() + right.str();
+	  result = add_outer_ptr_to_mbr_type_expr(p, inner_str,
+						  qualified, internal);
+	}
+      else
+	ABG_ASSERT_NOT_REACHED;
+    }
+  else if (ptr_to_mbr_type_sptr ptr_mbr_type = is_ptr_to_mbr_type(mbr_type))
+    {
+      inner << "(" << containing_type_name << "::*" << input << ")";
+      stream_pretty_representation_of_fn_parms(*fn_type, right,
+					       qualified, internal);
+      string inner_str = inner.str() + right.str();
+      result = add_outer_ptr_to_mbr_type_expr(ptr_mbr_type, inner_str,
+					      qualified, internal);
+    }
+  else
+    {
+      left << get_type_name(p->get_member_type(), qualified, internal) << " ";
+      inner << containing_type_name << "::*" << input;
+      result = left.str()+ inner.str();
+    }
+
+  return result;
+}
+
+/// When constructing the name of a pointer to mebmer 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 member function (of a containing struct
+///    X) taking a char parameter and returning an int".
+///
+/// It's going to look like:
+///
+///   int (X::* 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 "(X::* 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 member type expression".
+///
+/// This is a sub-routine of @ref ptr_to_mbr_declaration_name().
+///
+/// @param p the pointer to member type to consider.
+///
+/// @param input the type-id to use as the inner expression of the
+/// overall pointer-to-member 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 member type.
+static string
+add_outer_ptr_to_mbr_type_expr(const ptr_to_mbr_type_sptr& p,
+			       const string& input, bool qualified,
+			       bool internal)
+{return add_outer_ptr_to_mbr_type_expr(p.get(), input, qualified, internal);}
+
+/// This adds the outer parts of a pointer to a pointer-to-member
+/// expression.
+///
+/// Please read the comments of @ref add_outer_ptr_to_mbr_type_expr to
+/// learn more about this function, which is similar.
+///
+/// This is a sub-routine of @ref pointer_declaration_name().
+///
+/// @param a pointer (or reference) to a pointer-to-member type.
+///
+/// @param input the inner type-id to add the outer parts to.
+///
+/// @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.
+static string
+add_outer_pointer_to_ptr_to_mbr_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 = "&";
+    }
+
+  if (!pointed_to_type)
+    return "";
+
+  ptr_to_mbr_type_sptr pointed_to_ptr_to_mbr =
+    is_ptr_to_mbr_type(pointed_to_type);
+  if (!pointed_to_ptr_to_mbr)
+    return "";
+
+  std::ostringstream inner;
+  inner << star_or_ref << input;
+  string result = add_outer_ptr_to_mbr_type_expr(pointed_to_ptr_to_mbr,
+						 inner.str(),
+						 qualified, internal);
+  return result;
+}
+
 /// Emit the name of a pointer declaration.
 ///
 /// @param the pointer to consider.
@@ -28291,7 +28963,8 @@ pointer_declaration_name(const type_base* ptr,
   string result;
   if (is_npaf_type(pointed_to_type)
       || !(is_function_type(pointed_to_type)
-	   || is_array_type(pointed_to_type)))
+	   || is_array_type(pointed_to_type)
+	   || is_ptr_to_mbr_type(pointed_to_type)))
     {
       result = get_type_name(pointed_to_type,
 			     qualified,
@@ -28310,6 +28983,9 @@ pointer_declaration_name(const type_base* ptr,
       else if (is_array_type(pointed_to_type))
 	result = add_outer_pointer_to_array_type_expr(ptr, idname,
 						      qualified, internal);
+      else if (is_ptr_to_mbr_type(pointed_to_type))
+	result = add_outer_pointer_to_ptr_to_mbr_type_expr(ptr, idname,
+							   qualified, internal);
       else
 	ABG_ASSERT_NOT_REACHED;
     }
@@ -28379,7 +29055,9 @@ array_declaration_name(const array_type_def* array,
     {
       if (is_npaf_type(e_type)
 	  || !(is_pointer_to_function_type(e_type)
-	       || is_pointer_to_array_type(e_type)))
+	       || is_pointer_to_array_type(e_type)
+	       || is_pointer_to_ptr_to_mbr_type(e_type)
+	       || is_ptr_to_mbr_type(e_type)))
 	{
 	  result = e_type_repr;
 	  if (!variable_name.empty())
@@ -28391,6 +29069,11 @@ array_declaration_name(const array_type_def* array,
 	  string s = variable_name + array->get_subrange_representation();
 	  result = pointer_declaration_name(p, s, qualified, internal);
 	}
+      else if (ptr_to_mbr_type_sptr p = is_ptr_to_mbr_type(e_type))
+	{
+	  string s = variable_name + array->get_subrange_representation();
+	  result = ptr_to_mbr_declaration_name(p, s, qualified, internal);
+	}
       else
 	ABG_ASSERT_NOT_REACHED;
     }
@@ -28416,6 +29099,56 @@ array_declaration_name(const array_type_def_sptr& array,
 		       bool qualified, bool internal)
 {return array_declaration_name(array.get(), variable_name,
 			       qualified, internal);}
+
+/// Emit the name of a pointer-to-member declaration.
+///
+/// @param ptr the pointer-to-member to consider.
+///
+/// @param variable_name 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
+ptr_to_mbr_declaration_name(const ptr_to_mbr_type* ptr,
+			    const string& variable_name,
+			    bool qualified, bool internal)
+{
+  if (!ptr)
+    return interned_string();
+
+  string input = variable_name;
+  string result = add_outer_ptr_to_mbr_type_expr(ptr, input,
+						 qualified, internal);
+  return ptr->get_environment().intern(result);
+}
+
+/// Emit the name of a pointer-to-member declaration.
+///
+/// @param ptr the pointer-to-member to consider.
+///
+/// @param variable_name 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
+ptr_to_mbr_declaration_name(const ptr_to_mbr_type_sptr& ptr,
+			    const string& variable_name,
+			    bool qualified, bool internal)
+{
+  return ptr_to_mbr_declaration_name(ptr.get(), variable_name,
+				     qualified, internal);
+}
+
 bool
 ir_traversable_base::traverse(ir_node_visitor&)
 {return true;}
@@ -28590,6 +29323,14 @@ bool
 ir_node_visitor::visit_end(reference_type_def* t)
 {return visit_end(static_cast<type_base*>(t));}
 
+bool
+ir_node_visitor::visit_begin(ptr_to_mbr_type* t)
+{return visit_begin(static_cast<type_base*>(t));}
+
+bool
+ir_node_visitor::visit_end(ptr_to_mbr_type* t)
+{return visit_end(static_cast<type_base*>(t));}
+
 bool
 ir_node_visitor::visit_begin(array_type_def* t)
 {return visit_begin(static_cast<type_base*>(t));}
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index 10d65054..7b7111db 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -256,6 +256,21 @@ leaf_reporter::report(const reference_diff& d,
   report_local_reference_type_changes(d, out, indent);
 }
 
+/// Report the changes carried by a @ref ptr_to_mbr_diff node.
+///
+/// @param out the output stream to report to.
+///
+/// @param indent the white space string to use for indentation.
+void
+leaf_reporter::report(const ptr_to_mbr_diff& d, std::ostream& out,
+		      const std::string& indent) const
+{
+  if (!diff_to_be_reported(&d))
+    return;
+
+  report_local_ptr_to_mbr_type_changes(d, out, indent);
+}
+
 /// Report the changes carried by a @ref fn_parm_diff node.
 ///
 /// @param out the output stream to report to.
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index e71337f7..c6e0fa32 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1429,6 +1429,9 @@ build_pointer_type_def(reader&, const xmlNodePtr, bool);
 static shared_ptr<reference_type_def>
 build_reference_type_def(reader&, const xmlNodePtr, bool);
 
+static ptr_to_mbr_type_sptr
+build_ptr_to_mbr_type(reader&, const xmlNodePtr, bool);
+
 static shared_ptr<function_type>
 build_function_type(reader&, const xmlNodePtr, bool);
 
@@ -4184,6 +4187,87 @@ build_reference_type_def(reader&		rdr,
   return t;
 }
 
+/// Build a @ref ptr_to_mbr_type from a pointer to
+/// 'pointer-to-member-type' xml node.
+///
+/// @param rdr the reader used for parsing.
+///
+/// @param node the xml node to build the reference_type_def from.
+///
+/// @param add_to_current_scope if set to yes, the resulting of
+/// this function is added to its current scope.
+///
+/// @return a pointer to a newly built @ref ptr_to_mbr_type upon
+/// successful completio, a null pointer otherwise.
+static ptr_to_mbr_type_sptr
+build_ptr_to_mbr_type(reader&		rdr,
+		      const xmlNodePtr	node,
+		      bool		add_to_current_scope)
+{
+  ptr_to_mbr_type_sptr result, nil;
+
+  if (!xmlStrEqual(node->name, BAD_CAST("pointer-to-member-type")))
+    return nil;
+
+  if (decl_base_sptr d = rdr.get_decl_for_xml_node(node))
+    {
+      result = is_ptr_to_mbr_type(d);
+      ABG_ASSERT(result);
+      return result;
+    }
+
+  string id;
+  if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "id"))
+    id = CHAR_STR(s);
+
+  if (id.empty())
+    return nil;
+
+  if (type_base_sptr d = rdr.get_type_decl(id))
+    {
+      result = is_ptr_to_mbr_type(d);
+      ABG_ASSERT(result);
+      return result;
+    }
+
+  size_t size_in_bits = rdr.get_translation_unit()->get_address_size();
+  size_t alignment_in_bits = 0;
+  read_size_and_alignment(node, size_in_bits, alignment_in_bits);
+
+  location loc;
+  read_location(rdr, node, loc);
+
+  string member_type_id;
+  if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "member-type-id"))
+    member_type_id = CHAR_STR(s);
+  if (member_type_id.empty())
+    return nil;
+  type_base_sptr member_type =
+    is_type(rdr.build_or_get_type_decl(member_type_id, true));
+  if (!member_type)
+    return nil;
+
+  string containing_type_id;
+  if (xml_char_sptr s = XML_NODE_GET_ATTRIBUTE(node, "containing-type-id"))
+    containing_type_id = CHAR_STR(s);
+  if (containing_type_id.empty())
+    return nil;
+  type_base_sptr containing_type =
+    rdr.build_or_get_type_decl(containing_type_id, true);
+  if (!is_typedef_of_maybe_qualified_class_or_union_type(containing_type))
+    return nil;
+
+  result.reset(new ptr_to_mbr_type(rdr.get_environment(),
+				   member_type, containing_type,
+				   size_in_bits, alignment_in_bits,
+				   loc));
+
+  if (rdr.push_and_key_type_decl(result, node, add_to_current_scope))
+    rdr.map_xml_node_to_decl(node, result);
+
+  return result;
+}
+
 /// Build a function_type from a pointer to 'function-type'
 /// xml node.
 ///
@@ -6001,6 +6085,7 @@ build_type(reader&	rdr,
    || (t = build_qualified_type_decl(rdr, node, add_to_current_scope))
    || (t = build_pointer_type_def(rdr, node, add_to_current_scope))
    || (t = build_reference_type_def(rdr, node , add_to_current_scope))
+   || (t = build_ptr_to_mbr_type(rdr, node , add_to_current_scope))
    || (t = build_function_type(rdr, node, add_to_current_scope))
    || (t = build_array_type_def(rdr, node, add_to_current_scope))
    || (t = build_subrange_type(rdr, node, add_to_current_scope))
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 850c8759..0f2d2bdf 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -919,6 +919,8 @@ static bool write_pointer_type_def(const pointer_type_def_sptr&,
 				   write_context&, unsigned);
 static bool write_reference_type_def(const reference_type_def_sptr&,
 				     write_context&, unsigned);
+static bool write_ptr_to_mbr_type(const ptr_to_mbr_type_sptr&,
+				  write_context&, unsigned);
 static bool write_array_type_def(const array_type_def_sptr&,
 			         write_context&, unsigned);
 static bool write_array_subrange_type(const array_type_def::subrange_sptr&,
@@ -1928,6 +1930,9 @@ write_type(const type_base_sptr& type, write_context& ctxt, unsigned indent)
 				ctxt, indent)
       || write_reference_type_def(dynamic_pointer_cast
 				  <reference_type_def>(type), ctxt, indent)
+      || write_ptr_to_mbr_type(dynamic_pointer_cast
+			       <ptr_to_mbr_type>(type),
+			       ctxt, indent)
       || write_array_type_def(dynamic_pointer_cast
 			      <array_type_def>(type), ctxt, indent)
       || write_enum_type_decl(dynamic_pointer_cast<enum_type_decl>(type),
@@ -1970,6 +1975,9 @@ write_decl(const decl_base_sptr& decl, write_context& ctxt, unsigned indent)
 				ctxt, indent)
       || write_reference_type_def(dynamic_pointer_cast
 				  <reference_type_def>(decl), ctxt, indent)
+      || write_ptr_to_mbr_type(dynamic_pointer_cast
+			       <ptr_to_mbr_type>(decl),
+			       ctxt, indent)
       || write_array_type_def(dynamic_pointer_cast
 			      <array_type_def>(decl), ctxt, indent)
       || write_array_subrange_type(dynamic_pointer_cast
@@ -2874,6 +2882,78 @@ write_reference_type_def(const reference_type_def_sptr&	decl,
 			 unsigned				indent)
 {return write_reference_type_def(decl, "", ctxt, indent);}
 
+/// Serialize a pointer to an instance of @ref ptr_to_mbr_type.
+///
+/// @param decl a pointer to the @ref ptr_to_mbr_type to serialize.
+///
+/// @param id the ID of the type.  If it's an empty string then a new
+/// ID is generated.
+///
+/// @param ctxt the context of the serialization.
+///
+/// @param indent the number of indentation white spaces to use.
+///
+/// @return true upon succesful completion, false otherwise.
+static bool
+write_ptr_to_mbr_type(const ptr_to_mbr_type_sptr& decl,
+		      const string& id, write_context& ctxt,
+		      unsigned indent)
+{
+  if (!decl)
+    return false;
+
+  annotate(decl->get_canonical_type(), ctxt, indent);
+
+  ostream& o = ctxt.get_ostream();
+
+  do_indent(o, indent);
+
+  o << "<pointer-to-member-type";
+
+  write_size_and_alignment(decl, o,
+			   (ctxt.get_write_default_sizes()
+			    ? 0
+			    : decl->get_translation_unit()->get_address_size()),
+			   0);
+
+  write_location(static_pointer_cast<decl_base>(decl), ctxt);
+
+  type_base_sptr member_type = decl->get_member_type();
+  string i = ctxt.get_id_for_type(member_type);
+  o << " member-type-id='" << i << "'";
+  ctxt.record_type_as_referenced(member_type);
+
+  type_base_sptr containing_type = decl->get_containing_type();
+  i = ctxt.get_id_for_type(containing_type);
+  o << " containing-type-id='" << i << "'";
+  ctxt.record_type_as_referenced(containing_type);
+
+  i = id;
+  if (i.empty())
+    i = ctxt.get_id_for_type(decl);
+  o << " id ='" << i << "'";
+
+  o << "/>\n";
+
+  ctxt.record_type_as_emitted(decl);
+
+  return true;
+}
+
+/// Serialize a pointer to an instance of @ref ptr_to_mbr_type.
+///
+/// @param decl a pointer to the @ref ptr_to_mbr_type to serialize.
+///
+/// @param ctxt the context of the serialization.
+///
+/// @param indent the number of indentation white spaces to use.
+///
+/// @return true upon succesful completion, false otherwise.
+static bool
+write_ptr_to_mbr_type(const ptr_to_mbr_type_sptr& decl,
+		      write_context& ctxt, unsigned indent)
+{return write_ptr_to_mbr_type(decl, "", ctxt, indent);}
+
 /// Serialize an instance of @ref array_type_def::subrange_type.
 ///
 /// @param decl the array_type_def::subrange_type to serialize.
@@ -4179,21 +4259,23 @@ write_member_type(const type_base_sptr& t, write_context& ctxt, unsigned indent)
 
   unsigned nb_ws = get_indent_to_level(ctxt, indent, 1);
   ABG_ASSERT(write_qualified_type_def(dynamic_pointer_cast<qualified_type_def>(t),
-				  id, ctxt, nb_ws)
-	 || write_pointer_type_def(dynamic_pointer_cast<pointer_type_def>(t),
+				      id, ctxt, nb_ws)
+	     || write_pointer_type_def(dynamic_pointer_cast<pointer_type_def>(t),
 				   id, ctxt, nb_ws)
-	 || write_reference_type_def(dynamic_pointer_cast<reference_type_def>(t),
+	     || write_reference_type_def(dynamic_pointer_cast<reference_type_def>(t),
+					 id, ctxt, nb_ws)
+	     || write_ptr_to_mbr_type(dynamic_pointer_cast<ptr_to_mbr_type>(t),
+				      id, ctxt, nb_ws)
+	     || write_array_type_def(dynamic_pointer_cast<array_type_def>(t),
+				     id, ctxt, nb_ws)
+	     || write_enum_type_decl(dynamic_pointer_cast<enum_type_decl>(t),
 				     id, ctxt, nb_ws)
-	 || write_array_type_def(dynamic_pointer_cast<array_type_def>(t),
-			         id, ctxt, nb_ws)
-	 || write_enum_type_decl(dynamic_pointer_cast<enum_type_decl>(t),
+	     || write_typedef_decl(dynamic_pointer_cast<typedef_decl>(t),
+				   id, ctxt, nb_ws)
+	     || write_union_decl(dynamic_pointer_cast<union_decl>(t),
 				 id, ctxt, nb_ws)
-	 || write_typedef_decl(dynamic_pointer_cast<typedef_decl>(t),
-			       id, ctxt, nb_ws)
-	 || write_union_decl(dynamic_pointer_cast<union_decl>(t),
-			     id, ctxt, nb_ws)
-	 || write_class_decl(dynamic_pointer_cast<class_decl>(t),
-			     id, ctxt, nb_ws));
+	     || write_class_decl(dynamic_pointer_cast<class_decl>(t),
+				 id, ctxt, nb_ws));
 
   do_indent_to_level(ctxt, indent, 0);
   o << "</member-type>\n";
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 8af6a2c4..231aaa6b 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -389,6 +389,31 @@ test-abidiff-exit/PR31045/zfs-abigail-2.4/libnvpair.abi \
 test-abidiff-exit/PR31045/zfs-abigail-2.4/libnvpair.so \
 test-abidiff-exit/PR31045/zfs-abigail-2.4/libnvpair.suppr \
 test-abidiff-exit/PR31045/zfs-abigail-2.4/test-PR31045-report-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc \
+test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o \
 \
 test-diff-dwarf/test0-v0.cc		\
 test-diff-dwarf/test0-v0.o			\
@@ -759,6 +784,9 @@ test-read-dwarf/test-fallback.c		\
 test-read-dwarf/test-fallback.o		\
 test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0 \
 test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi \
+test-read-dwarf/test-pointer-to-member-1.cc \
+test-read-dwarf/test-pointer-to-member-1.o \
+test-read-dwarf/test-pointer-to-member-1.o.abi \
 \
 test-read-ctf/test0		\
 test-read-ctf/test0.abi		\
@@ -901,6 +929,7 @@ test-annotate/test-anonymous-members-0.cc    \
 test-annotate/test-anonymous-members-0.o     \
 test-annotate/test-anonymous-members-0.o.abi \
 test-annotate/PR29443-missing-xx.o.annotated.abi \
+test-annotate/test-pointer-to-member-1.o.annotated.abi \
 \
 test-types-stability/pr19434-elf0 \
 test-types-stability/pr19139-DomainNeighborMapInst.o \
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt
new file mode 100644
index 00000000..a88d96fb
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt
@@ -0,0 +1,18 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
+
+1 Changed variable:
+
+  [C] 'int S::* pm' was changed to 'char S::* pm' at test-ptr-to-mbr1-v1.cc:6:1:
+    type of variable changed:
+      pointer-to-member type changed from: 'int S::* to: 'char S::*'
+      in data member type 'int' of pointed-to-member type 'int S::*':
+        type name changed from 'int' to 'char'
+        type size changed from 32 to 8 (in bits)
+      in containing type 'struct S' of pointed-to-member type 'int S::*' at test-ptr-to-mbr1-v1.cc:1:1:
+        type size changed from 32 to 8 (in bits)
+        1 data member change:
+          type of 'int m' changed:
+            type name changed from 'int' to 'char'
+            type size changed from 32 to 8 (in bits)
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc
new file mode 100644
index 00000000..47ed40a1
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.cc
@@ -0,0 +1,7 @@
+struct S
+{
+  int m;
+};
+
+int S::* pm = &S::m;
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..4f05d85961f6dcb600ce77e4268c60d9f74b1b21
GIT binary patch
literal 2624
zcmcgtOHUL*5U$zTg@uvlCW@l&Ks16lvkzcJ6x@U;poS3CgE5B8>^95jKFI7qFdjU5
z@Z!O%p8O4l#EU<{_%A$qGx4BRGu_a%vx$j`m2_9tSI_C!yu5Yqc0$uYkOqrzqzM$@
zbLvPghhiCqVF(_foB}OPP#8BB8u^sC4@pf+&!Va~K-0TP0!SuPUNeByd6Ws!#=CaV
z+|_#nl^z|Zh_oT?Vt>Zav!mI;QvivKrl$>K-nedDGqeom>;pX=sjHbe0~22W!&o$Q
zY$uh4bD7o5oe_Yp8OiPD=>$S>7Dpni61E=Iljb7IDM-U*<eH}a?C&E+Ux)*RZ1}MW
zEt?pK(uA?gYY)w(sj0$Mvrw>S?1EX$7pL>3{H!^#!K&tp6L5o7oHVUQu-jw{HP&Rl
zS3%YBE87eEb0w=ZW9=19s|LC4R)giLt?E-RSM!2g-E$q+t2tghx4to*FP8GTfVG2m
zuIdC%C|YQ*dRto-+eiPM7Ope%t)OK!Si@yLkh`@LM3Czjti8Nlsr<h}9qPmK($c&+
zf$KN<7fTneb^Juzl7#QS;;ee?$;M;EPl6hwqa}`XtPn>!bj87#rMm;((*eh$978&s
zh(W3U{tkHGA2^-;A?dpgPk)Dv!Fw5!@asiQ{z_4SaQSP7qc9+x#s=3<DmYi+jD(9?
z1U=w5?W?Fokm!MOOHUJwlMzYO^&%Cna4zsqTrVj2SFVHIe%=Ti7kS`Ed|OBX+Yi8|
zD+jjQZiDT!x?@+FyIb4znp-Wjg|g$iKHEEHc6_H<W5+}4UXzIsEFnaKH$%PBYBU(W
zmv*xiFdOfP)efA>Gtuck@llMXwH50rl9h#^@bKA_urZVgQ*TOH@{vU~{t_B#zdOat
zXMyslI_;mDll;mwAw7xM;jH@7xuDxzKJ<u$34X=jaC`tcL83n0BccTyYEHu6(S-Ck
zVu!QpyN(tWBj+DH!sJ{q)%PwM;`%?}{fj=Se|m+~{;P<oIT3;p4wgufNcG)BTU`Aw
zy#5N0rTX+fsP%UcqnvphGOh7Kv_3M4`hveeV_f`u?(j_x=Dq}p_}5%k>%ZcE^&B}%
zB;o{ri#8!kZt#)E%NWV3FX?fv2OM1I0fXpA@1MGUw5ICaK?u@({po(oq}CroV_f_Q
Ne^fun!6>WozX7|i+-?8>

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc
new file mode 100644
index 00000000..3a536856
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.cc
@@ -0,0 +1,6 @@
+struct S
+{
+  char m;
+};
+
+char S::* pm = &S::m;
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..253a9a353be4d769402911fabb1d7d579364a69c
GIT binary patch
literal 2656
zcmcIl%}>-o6o1{q3RXUrO%z4lLNtQd?gy|U3T{FaP(ujH!5Bl@-C?)N?vidH7!Upd
zdi3f^5B?8a{2M%Z^y*D-CLZ*?b_Rx_8%&HZ>Ad%T?{lW}+E;fT+)Zd22-08<4m5!R
zeC<4tOQBeT0Z74PlsiG|A}EX-4vl<CJOoYCx~5Ro>!9hO1kj-+$)WQiE@ab2l3Qp_
z8n;mC)^UkQOKF#T(}tcI%JiQBNTe}?VaymejT?rR#+*H%cSY(_dfLFmm%uRQ480eV
zXW&A5DSdAcAUP?y-9DQ@2+re^2&;sxNA;w&fO02v!BynAg<rir#At{3ppXeSo6s_e
zz9>x?yRf`w&X14hubcV2J!$97Las28E9R!m(N$J47oC6`tiqUS)r0K@o2{}2^Sv^v
zj$f|L?oJo2;-s}xFs&+-YmN^AYX#O;;9Eh{s=I#P+R5AHGGuGbI?Gm?m1kbI>IK<N
z&vjg{>Uf*kmDPz{p_t23WGh>70w)wLv{$^14U6rf|5np$1T4zR>MryDL&i3(w}D|{
zetyOr#X}tXi}MQ)yzN4-rvrZcj&smsZ#Z5jek0Tv9W8OBV}&@<A-vv4Ogfx6f)SuY
zcN-k9bPVZmDh8!Ic<*CKhn^!S%|J@p*Zvf=c{ezpAql^esL8t&6$qDiGZ2LV;q(YP
z%>{wuc!zXO!bL5DrX`&6uW<bl=k&fs4+M$cD8KaSf)O$ziMn2-!ZpqXzQ^^vf`8^Z
z*sT}!z;TfWe#C1+3fOJ{HjN$FZmR{h&o&*q!rblZy4TofqAipi*Y(-XA+zH<jVe1F
zvgtLL2*DCUBzQg4%guV7HLzr(8892i$7%&m`MK!ypZE|))7gsi6v;|LP<Z%Rl(1ox
z2~#JiB>Bjq8h-_ibPw9a%XftGs5-qrH7EI%XhC`!vHex`rF%hBUfTDFgd89Jj~wqq
zPLQZi^F=g^kD8P4ceEfqiP-+C`qDjDF>?ONBTUW(Q+@BFA+G-~ynoRr^-o_Xwf_oY
zYEFb;kb^~1BvO6X(H2+#JFmaUW2rvPwOW4*G0K_4N2X<7XiWxD7WD;x$uTwlJ$Lwa
zO#JIM@o)HFKYL94TOO~t!5)uSanZNHNsn{=#K9FF(2suf{Zr46&QzTpgrJ|FKh3vH
UYW)-%<Kn0JNA-gojItX42NS8?>;M1&

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
new file mode 100644
index 00000000..ad065c1a
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt
@@ -0,0 +1,13 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
+
+1 Changed variable:
+
+  [C] 'int S::* pm' was changed to 'int T::* pm' at test-ptr-to-mbr2-v1.cc:6:1:
+    type of variable changed:
+      pointer-to-member type changed from: 'int S::* to: 'int T::*'
+      in containing type 'struct S' of pointed-to-member type 'int S::*' at test-ptr-to-mbr2-v1.cc:1:1:
+        type name changed from 'S' to 'T'
+        type size hasn't changed
+        no data member change (1 filtered);
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc
new file mode 100644
index 00000000..47ed40a1
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.cc
@@ -0,0 +1,7 @@
+struct S
+{
+  int m;
+};
+
+int S::* pm = &S::m;
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..707440f9d2b03d60b324734e39c33563dd9da5ab
GIT binary patch
literal 2624
zcmcIlOHUL*5U$zTg@uvlCW@l&Ks16lvkzcJ6x@U;poS3CgE5B8>^95jKFI7qFdjU5
z@Z!O%p8O4l#EU<{_%A$qGx4BRGu_a%vx$kZlJ2Vd>N)+Im$&ZSPG}kk(qIveG=Tzq
zP94eRP%OhR48bFmQ=p{@3ggB?BcBrYA*pHUSyc4~XnHqE0Lf&^YX*=yk1`?Jc-Ib^
zyLxY+(xc-Pkv61V?9Ui_b~HP93Lufu^t55j8`q6%hL*vceW0f!bu}|*VB!m47>kCE
z?WD4BF0-1sGXl^xBe~r?oj?fA;z)#5!q%gD(p*G21!=g9T+_6l{e8sf3vr;34L>%a
zWfKEYnlN^G?V-6eHC4E377F%^T`-IJ;&i^0pEV~oSk+u{0&cL1lcv=OcAIRW#+uCc
zDyTYsWqV<Nu4I*Fti7UX)gWN)z}g9XD`;5_*DqRodAm}9+;*$Ma@AJ#sh6vHL9Xt(
zj_cJNubx}qn9dhV`5Z;Ib5$pBLeWBd)!W*#*gpF2v~c-Zl$AAH=KqI`9a`@I!}8M7
zyg7mEH~AM!7p`^uMB9>t@4w=#dhE%@W5iE_8l$5nj&!ULM>=%H!I-7H1K!gC$D<rW
zI-H0>ssH{Cc;6p5o&6!{yADr(hmFB|8IthpMNR%nQGsyzYlfpRAe@GvlUxuuUh9y~
zNVup)&;yRszKU7|i5@7A^fbXZ8IeSOFH+$O=K}x4^@4(b<vQ5y=Z(N|kq3Unw}lk2
z{QzvbTVT8GHrPI^J9d@1yR}WPxz$2jC_Ap}v%O<x$9I}Fc08o+HJJ#(5<(<+Gt?`s
zMuXvdX*XK|v+<5t?ZBx#6P^AOAH`@|Td|%ZSy>1Q51%~=8$+2e^`?|1A6Zo6FQJk4
zyHmV;7ATLZ)BdSB$*)Wk(vyfC&Z;k+3%bqaLyt(9;8*+&#|MxTB<j;WB3i(q<|O<b
zO-PR;b~vlP>u6Cia{j?1OwI*Ueea?nuKxqxzvz?tr&mbrzlxZe6CoJkV2KooRNqas
z#nu19>#y)ws!#8OT7L&I%9+O@(;6>C>m!q>FZc^I#>Kzq4&UTp?n{t}f6ZmJ{ww}h
z&yll4B2MtPXcMyJ1|NC6jFGJRk{;)Jz`=DMFo=Hi{;BInYpUKIgdok=pYFFzYW*QJ
Q#>J2DNA-gojItX48&!4OHvj+t

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc
new file mode 100644
index 00000000..f9828109
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.cc
@@ -0,0 +1,6 @@
+struct T
+{
+  int m;
+};
+
+int T::* pm = &T::m;
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..5cec3e47ca82475c1a802563c054f86b44a58311
GIT binary patch
literal 2624
zcmcgtOHUL*5U$x_VPWLCiK3`G5RD+t>;qU41veoIs3C;l!5BkkcAI5%Uzr^U#)C%>
zUOaf!lfS``c=0C~|Aj|yCLXkErW=}eHZd`=lJ2Vd>N)+Imv<iAO=ubj(qIXWHGu+r
zP9DppP%Oa+48tRolc1#t3ggB@BcBpm(4}dqIaKvJXnGGx09{>4uMt4<BFcnl6WuK|
zclX^wrB}x(B5hc^Jdif@%vfgV3_v2S=_$ilFm4(*3@wd0`$11d>RNi<z{HopFqRA*
z+ev2NLV7KIZxo<=R&u+2Hh~bF$B_uDgsn&Qq`81{5>jv#xu$792l|Q87vex66Mk$$
z%OnP)G-2$@`a^ShdOCmI%;)V{J8u?pg_&G2H)l?6vWmIt1l(X1rcA3I>^0b8l{J{}
zl~Hy4^6uine9<b-TKfglszP?RS!dZwv+~r-R=prw^IXUEs*YF7Zfwrv3dLMDVC|rt
ztvG=biWb@{-p-E24$!~V#C2xA6*R3ntGmnxa<^JR1i5~}+RxkN^8YK;p+2lEFE5yr
zxPDWAv2@{D$4|5^UGV)^oK=rK*?5fjNl;^Sw8W8)72-&T?l>5;^mM>`JK%VfV@QWn
zF(~yv&;jrN1E;e;EPdC}>F=;HcrQZ|etoFPUnwdOE`QBP6b6LT*yQ?Y1?MW9lW<Xs
zpe>HmzKU7|i5@7o^fbW)8IeR?FH+$e=K}x4^}K?A<vQ5y=k>sGkq3UncZC$Ng8*#0
za$vjdHrPI^Id+A)d(~~PvC~9bC_Ap}v;7lh$9Ec4b~2>qHJAv&5<(<+JJid~dY$2W
zX*Zeyv+<5t?Z7EN6P^AOAH!%`Td|%ZSxE>A51%~=8%LQi^`?|0A6Zo6ub`3kyHmV;
z7ATLZ)BdSB$*)8c(vyfC&8jb*3%bpvBacX!<X8L+#|M!UB<j;WB3i_u<|O<bO-PR;
zb~LNL8)#86a{j?1OwI*Ueea_ouKz>czvz?tr&mbrzk-;W6CoJoV38DwRNrm1#nu19
z>#y=ys!#8OTEB%D<;>xbX`L6M^^r-`7yJbp<Ko|Qhi`H)_a#Wgzvi-9{}unMXUSP2
z5hwUtv<X>qgO5C3#z<CuNsn_q<lqJm7(zdK|J3!PHC68pLXhI?Pxo6Uwf-;~<Kjp8
MqxwM(Mp=#j4FQ+jcK`qY

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt
new file mode 100644
index 00000000..939fae6c
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt
@@ -0,0 +1,20 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
+
+1 Changed variable:
+
+  [C] 'int S::* pm' was changed to 'signed char U::* pm' at test-ptr-to-mbr3-v1.cc:6:1:
+    type of variable changed:
+      pointer-to-member type changed from: 'int S::* to: 'signed char U::*'
+      in data member type 'int' of pointed-to-member type 'int S::*':
+        type name changed from 'int' to 'signed char'
+        type size changed from 32 to 8 (in bits)
+      in containing type 'struct S' of pointed-to-member type 'int S::*' at test-ptr-to-mbr3-v1.cc:1:1:
+        type name changed from 'S' to 'U'
+        type size changed from 32 to 8 (in bits)
+        1 data member change:
+          type of 'int m' changed:
+            type name changed from 'int' to 'signed char'
+            type size changed from 32 to 8 (in bits)
+          and name of 'S::m' changed to 'U::c' at test-ptr-to-mbr3-v1.cc:3:1
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc
new file mode 100644
index 00000000..c763abc1
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.cc
@@ -0,0 +1,7 @@
+struct S
+{
+  int m;
+};
+
+auto pm = &S::m;
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..fd4e48b1328742f93ad020f2441c099e08264753
GIT binary patch
literal 2624
zcmcIlOHUL*5U$x_*Ts?NCW@l&Ks16lvkzcJ6x@U;poS3CgE5B8>^95jzA`%yj0cY%
zym;`cCx3$>@#0S~{tJ)ZOgw1SOgA*`Y+_=pq`RuVdQQLQ<*j?S6PgBsG+2Z~O`rgu
zlZSFS6w5FSL+}XYBxq@Z!nm=}$fv}8=+U(FEUJ0~H2oM!06jfPuNgq{Jj#S<<Eb{9
zQ>h!M^y)Z8qz!2o`!j}~9nB7&0!U;uJ#85C#&zSGp=B^<AL!{wUCqoHnD_!1#-gEP
zJIO4Z%dBSZi~yu&B)6NV69~as9Eq?>*m_h?nu{nWAq|(2Ynt}6zmFJwAr2I>;m0Pl
zY+@iv6UHvDJv5i5rV3ZhLcyM~3uZB2oX(f>v*yGGtC}lLzztS$(zF`EPLnOvSd;l)
z1y#qdY%lE1m8{Z?wOcf;8U(BpSna^Kf|k{A{b_4AZ&xai+io>juG*?T^>Q^Y$kjd9
zalM-3)pP3`)A?d4pQFf5uIdC%C|YQ*dRto-+e80$3zwfoSy{tn{(s2WrS&c_EH5q1
zn-jQxlYg;v;abN}v@JdG{a2h-k3HFVjQB}VV|28{k&YGONQYD$j9HF#!F#*lc$8yE
zhZ8X<_21tG@B0I%vp*z#*TL!UvN3osLlS<+QIo$?R3Kdbn&Bu62&W<FBo_pZ*E*y#
z5-w^H^nl~Euc8(~q6f+&Jxwr9MkJBni&VJ6xxhbhy`bP<xej*cc_VOK<bfaYZ6O70
zF94hF7T9j51GdlVj$LK$PHod`Zne-B%8u*$Z1;%S@ttOk9Sx~_O(sIHgb)ed4E0K@
z(O~#q+RawLY`h~@CvYmyM5q76M=_e#R;;H;Ru+Q7!)H&z#!x0qy(wkMM;6uiOK7D1
z?iMef1<Ir9w0~+&@+;GX^dw>jv+7Idf^Kv9z#|eS_!WP{@d4xniTZSph!$|DISGG9
z6Vl^|9n7llI$BhWoPY2LlXJmT-@9mt>wlm3FZ!hZ=@nA@uOg=AL<mMWSRzFt)prwZ
zarM9O`YSw^>eKt6)^8(5IrBJVTH}RiePj~#1%H9YxcK+n;hP-HeF+lrueq$&f5rdm
zIdYar#0mZuZ9<mZ;3JQhF_KkZ(&JqBIk?UP2GNh+KXv_RP1U=D5TyC~)BTo7tv`gu
QxcCwNsD6-xQC8!B15EwgHvj+t

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc
new file mode 100644
index 00000000..d9dabec6
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.cc
@@ -0,0 +1,6 @@
+struct U
+{
+  signed char c;
+};
+
+auto pm = &U::c;
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..8e6d7f59ebfc9773c8d87ccdb602365e00ae892a
GIT binary patch
literal 2664
zcmcIl&2G~`5FW=Q1Wa4nNKhycgFqCDou8Hv3WZ1&&;mkL1qTGEvXgCMNSw$qRS^ds
zfFoSFaX`ERH%^>+0*-LxhQtA8?A>(PIw}%kB=5|8^SkRE`^B}}*HfAXf;6}STbe)t
zzNWY2S|rwB0><G!%4yKD1VwSjBO_l@_dwIM?0Ho6I%xVBNdUXF46*bvTnN!lWO^OY
zGMUS$?9p+FNgLNrjphtJKb7Bq5FnM)^sHgb8<&iWhL*#eBcNwvbvaixF!4z+j4Osd
zipleEG`F0)ISG)NliaQzN+ASC@JU5gqSoVj(ppA24Ouvg9Jlaubc7h~5FZrs(PmRx
zJ~bAniDLU+(`OB{-f{xCap#`7I5ShaV3tbuoLw@@#qw;iQao=?ucFVA6LN!9K4V&)
z@Tt!hn#^Z`S4Y(e>aB&%YQ?I|SsP{3YC_2Rq16imE9_bwH<-0HN_M>tg;ux23XN{#
zu~%q%VWI80j_WlYuU%MKoh_Ct#R5h43k@f9BGE#7!&_gs*e3e-x}G1hI4kS8Ecg!@
zhqOKfh8v5E^X4?3-<iKSy6D`8FZ7yr!S`QD9(v+U$7{uJh8m-zC5d#bkVHB}*L<5v
zhuzyS0(96j1jnnLKsxM8Kq(L2{{+%uWE)DeFfQ$DFbzXq4$f&r!f!8X@-9UM!f7|6
z!-*&gfN**Q9pHk%am*t+Ea9RSK~)KtPwOtn>3xeH2ok+fe(4hiC&-8->UyyX=QtPm
z2d<YC{4>|V?mz2<j*C1DV%`!`$TmZ;Y3{&w`+cwj)^_X$bDuWXJb%55wn%ndH((oo
zn4Q4!o9xe!w&ybuf+d7V@LHtTyPXd6v83M(nT_*f^+TurM0EO3d<vuKY{hwsWHliu
zJo-FJ*m0BzQzxh<`N*Oge;SQ+4~E6dcZBk&I=w$NC;8QAL3$Lk!K(Vwy`U+t4Lo9@
z%18el$H$NpB<j<A5iQ`O<|O<LEl3YyHds~P6||@rIsf1hCg*~wzPHej)c+UWzvz?t
zr>~RRe*-Z!CqgjE!3rr7slIDyORE2a*I(kXRG;Qrt=~h8au)HC=?*XSPzF&J^#y;<
zF*W`@clfqL{L3NnulV1;utWT79<R8;M;@=@qHlqdp5*$8gDX5>Kl;)4Pdz_6Q+0L_
bf=Pb<G~Y6*^~cee6kp>X)wgmm%4+;?2kqdP

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt
new file mode 100644
index 00000000..617257b0
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt
@@ -0,0 +1,12 @@
+Functions changes summary: 0 Removed, 0 Changed, 0 Added function
+Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
+
+1 Changed variable:
+
+  [C] 'int S::* pm' was changed to 'double S::* pm' at test-ptr-to-mbr4-v1.cc:7:1:
+    type of variable changed:
+      pointer-to-member type changed from: 'int S::* to: 'double S::*'
+      in data member type 'int' of pointed-to-member type 'int S::*':
+        type name changed from 'int' to 'double'
+        type size changed from 32 to 64 (in bits)
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc
new file mode 100644
index 00000000..9161dfc0
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.cc
@@ -0,0 +1,8 @@
+struct S
+{
+  int m0;
+  double m1;
+};
+
+auto pm = &S::m0;
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..36f028461af4c24312b17bbe9f0768123337fcb3
GIT binary patch
literal 2688
zcmcgt&2AG(5UzIHv0+F^u*5&>2?Fsu<FN@|$SSO*hz$XRq96pfXvXe110GK_o}jGu
zzyomIN7%z2kaz%&ya87(T=&Qgi33!PyPZxm7Dz~2Qg>B-_1Dwg)$`)^{XYtffg%RC
zU{6yh@~J(!or!HY0(0;T<r1(8K?R!TX;Q==!YpHzHtH<$fR{-^u>r+{D=1Z<SS*Eu
z6iSsMS*Cu$sf~l3EpJD_%2N+eIlyrm5t{~HS)6CTSvRfK>J1Bv&av||Rg2e7)n<<Y
z@G9dK%UZO^gH-{F=fJXVSsYhblHv>&s==A+YW41Mfbs&R%=}lYzn>@|1gCLiUxO>m
zqb7nSv|UEd82dakO^o&p2MV=p3k$4PI6O*|C0Tj!$X>p3rSYrXXt)b*!)|)bYhKH{
zZeLs%UHguoN`uq9WIIv1GZ0HXF%U`ELDf$>TT8n)T25=hdET_09(3cKpf8}l6-T1p
zjk{07dM`}t{V?!@u;+*U`r7(6ui5hIsTiiide=|=OmxuR4L3I(v5WrOF`j@(oHTYK
z5d|Uva(A}V5fmg?&vQGS|F6)5`mnORyl7v<ZM^gYJD6?x#EA~52p_-XIq>`r050!@
z8N<<%M;t5U5!ahZbKp?cv^|l-fjvc&IN<%yAr6OfQ0xuBo1a4*roTa{3+A-%8u!73
zv%zl7NckN^O?xuN6$sbA=Ex`v2&b_w^`izZRXC~Psun?aHJtLVNqtjtI&b|e)!L|L
zN%{~wD`mBwQ0i9={EgHb2L4X!;12(cQa?bRCL_M3q*Uyt;8Hh&8w`iwCZg}VT@mc`
zHp0PXjJ8bngCG&l_nG~~AN0ijkbXE2Dg;X?k>HI?@5E6g@R4-~aVlJFA7_~Q9eTNc
zo=#y3+FP}sDq~v-2G1Tw4Vy=qFtdZ&nvX7;@fXlY_h3@Ien%*esnhwHImxe06H+{4
z<Jt73dqG{^9(#<0HQD<AO8hW#f>eF#FQO$JW=_Ii(}dI;vGHvB(mgjZay}|Sn-q;q
z-+O4wTmL7yezi_oKfO-o`n!mkIT3=E1Y4wNWcqHPEwBEpY|1+_mg-YqoAtL5qnsWN
zo%*uSV;w|U)mQv4iJ9?lrNe*UiGMjE{+0ai*S{10w~RO3;Ju7DakXxRlb+}LL4s>C
oU>5!8{WJHE_SEbhgus*MPyMZvS$__VdGSx=`Te5@qin{11-gdeg#Z8m

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc
new file mode 100644
index 00000000..ba677741
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.cc
@@ -0,0 +1,7 @@
+struct S
+{
+  int m0;
+  double m1;
+};
+
+auto pm = &S::m1;
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..4dbd70288431b6cfc03bcf2b3ca8cb31c00e59eb
GIT binary patch
literal 2696
zcmcIm&2G~`5T4B@O~ACYMB*RfA`riJekh?7wM43*6cDOF2yVqrwy7bGE5}7e9C!e(
zJOT$E0Eq*Sz>Qbn0!PjqV8+>{+r<$`h>`4>`R3QVJDa?`e&<GxF;K){0k$=T0+hzK
z<yI=TU>{6DNy1N&7l5T|j<9KINEyEmlZ=&GsIagGyhsv?b;$2tLa7A#d?Dy3P$=ce
zGIktaWMC(X8zHdb*j-e1aeNJljRP;uO|z@k6>GUXYXRh@*r|!K#VbcDlLr8Jnemck
z%~|BZ$^iM3U|9<m#|{fpoWMdAI96UR-#Q3ToS~Gd|8n`-p&UYR6rc2KetoB`FIfY5
z0d41yGseD8j1!~v!v}>*x|BIq$?YAcN#mC8KCl<hpRZrG>vea=t=o-S<6^B@yJVla
zCpz{`FOdePan^RiWV0{kyP_}RppB{*x7X*lW}8lP#(CDToi22uO}{4~5rf3pNMa|6
zoY0TaT6f!RsIEt$sCJ^xlc3rSl4>vTJwNDrL9e=U?_#adtW_y;Q0;h$mx>PBJHgtT
zBeu|gBf^al!>l6oMf@K!j%a-Z3`>iPbM_fr#<PF1g6Wcve9;Ew;oFZa2c9_zc(&x3
zFk?7cvWR1aEaIRImFB>qsA=0Ghh5u>CUL;?pFte<WT4bPp8O2rF#a1#Q!u4{ubTH!
zrwykyCFQppHT^491;X{O**6RW!s$`8UkVDx(N5{GhO1fx-O_N%zasTD$!Wh;4+N>+
zD1U(fNhc&%bpxqiFz^pjuN(L$se?Os9wwfTJc);VT}g@9O2DPD1J@r6z>P)Eb34M{
z?5+m=wFqsg?D>8yp6xJuvDfd4oguxTFH{JYP$I#rsosvlP~au&_M=3&I6lrG@!E8A
z|2rMQ6tuQ#Jyph*5)7VRj2bqLGGXQfwWN=}#{`-BX^ENfH)XuZ%=)x{CPpzTJ~9%R
zzH}~V%3FrtBRTqSCB7FqL8^b6FQR#T%$$V3rx#Lp$bP*|UpnU|M$X42Xp^Fm>3bV(
zS^cY_P<>MWbUT^-cMvmkA_NN(Y?7jp>AQ-ytojG#P^x{P`ZU*O{SCw@XAK{n5?Sb>
z4x+5;EB-=aX8cF#@bwSzuSUeblfV1bKg7S5@rE0G*8Vr>Hr2PnNY8TpBEc0IFo}M2
l|C#GYYiiC8LNH64f<*JJlUaWXjal)J<^H|VgHbl)e*(#9;N1WK

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc
new file mode 100644
index 00000000..e8c26c23
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.cc
@@ -0,0 +1,8 @@
+struct S
+{
+  int m0;
+  int m1;
+};
+
+auto pm = &S::m0;
+
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o
new file mode 100644
index 0000000000000000000000000000000000000000..e07652ea76e548177ecec710c45fd38850f3675d
GIT binary patch
literal 2640
zcmcIlPfrs;6o1ogp}K-V6aS%hL5(2p_K#2z12!Rus4)cN!Gj^Y?NC<PmTXso@!$vW
zVvHZbnD`kydGl!e1YSLQ_Mq?W&cHZqjfwFkJMX>U``ej$(-%v3Z)O++NemWXUy~@n
z=iI(rkHtESz%Y0y=YZu2%Fr@KizMSd<QdB^pw5Ca7$l%nfh<W`$YyhXJA&L<)MBUc
zzU=^5f8P=UhYVa2Vgq30=f>D|^V(SdN@3Q-V#DmhV8Jwsqs5`)07iisdDEOT(Zys1
zOnx3rbHOyQvs@9*6jlniPXP2yQ=-^urEue91|c|&U)(yxze1GUXH^t)XuE`*G4^9{
zfEaBOekc^<{mQUn=4g^84qd+Yz*?M|s$8`y6=&M1Sk-d%O1V~^u_o4d)4JtG!eCb?
zEjx&ww)uREw|VF{P<6w`=KSt#&8|(`J5|eWLBzX}y&Z*i)Ug9EoUwPxPNM;(%}&5e
z%}(>NUuyYLY0LLq&u_W@R%vzZO1WAqmngDZYPyjdi#FPu{>FyQchP^lg9pHqtUT~|
z_#ZO%XuSsv%ZrP1)&%a~<X>!Eyw`tN=xnm^{b!nsk$ThdE{W@)#~5fyBLgd>kpX>a
zFlOoRfgkFD<9$yd1CFGi)c;@)eBc0112C-ouDucHaXL7jF-gC}sHwkFRv=vcH6uwF
z5Kf<@V?vNPj&e+=6kOIK=#jwbTxBhSWDk@_d8%NXj7T!SpQvzIaEX5qdPT#(2pyd6
zvmkOk<WZRLO({iuHv)$S3>>f91t;WNuG8e+)7HA*-sqq$mR-*a`Oa@<H+0)A{(H!l
z-{vv|OGuI6^;mCof`H?*>9ji$cW_YbZsaze$WH%>k76|Kt=vzUtS$wO$8Vp4jiF4K
zJ}Gs@M-}z>i)f_t?iH`z1<IrAbbfkH@~hK=w2`pARrjTPLDO8{^GJkQG2*WTeiS)D
zvOdib(L8>7PQu^Of+X*6q8;>IMMGM=AwWw83a<O!K|HPhPojU>C-qOSklue2F+C?j
za87_VQWVmC*U^?%|Es8fOT<!rdLQ)q+lW!lGJYyO6oqJiRFd^2e~!kq`1iu$n;I;9
z36k+Ig{;?qE&kd|<gAd4ll%?Zq^!8XM-i`LB<sGUr@4L-;Hn51LO*){^!=kf)n^AG
bI3f0*=36Db{xBNT;wQwT`c@4_S&#n(0c+iY

literal 0
HcmV?d00001

diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc
new file mode 100644
index 00000000..fc2cc13a
--- /dev/null
+++ b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.cc
@@ -0,0 +1,7 @@
+struct S
+{
+  int m0;
+  int m1;
+};
+
+auto pm = &S::m1;
diff --git a/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o b/tests/data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o
new file mode 100644
index 0000000000000000000000000000000000000000..24d3038430dc2d64be3701bbef4d59094a54fbb8
GIT binary patch
literal 2648
zcmcgu%}*0i5TDm=p}6wd#4pq?L?ej1{QxRrz$OF%HHKh38nW9y$|~EE?Lsgf`~$pr
z@Z{OEiD&-;Z^V;-f*w74(3$Of@_1~GiHVcEH#5JPc{4ljqkXyj;BJaBki=jSjx>n^
ze90Wi)mW^;2n<77z#j4puq>%5n#O37WITc_W7$R2Sx^Ln1e8jUCMgZ+bjEK+khzRn
z>@?o98vyI=Sw^7Gz^Oy5AB^n$7`tuW8tYxl&6${Nm|Y#nnMQszKXewr$T1^pn)4>Q
zm@J2jUjfrxG!3jQlZQ*WwcNdP06jCbQ0%mpyK_E;5M0C&mk#k)h?GaHjA90D*O4>E
zehl;zqh{eiAs_cG#qz1a&N6Z6%EQOj($rMxrd29AGfv4W7t7PdN^#bj*x+?*)s2L~
zE>Bu^5bZVjLW4JX=+{tn!`k-3!Cb|z%-H*7%WgnnyA|+4y;Xne7aD$4*zrBr^Bb<e
zQ&``aE|x3BLd4rqyHIx{Hx_NQ*Zr+6n;)S6ZVNljLpy5O0S`PL0=e6}Q3vwES$n_a
z)N21PQJ4I%va~dBO<?~f|Dttqum3R7-lXCC&m<Qk@x<d<630Q0G0>7k#_!v3+-gA2
zaX@GW^mf7fy5M-;6Uczm2`JS+&;{>5fzt&TR=)T573i`%cs*m1ey31Vzfxu(T>YAn
zP8bkQV?*d?G+d}~LBVA%f}RMR_EqL0NY+4WD^C`TlMzYg^*buu5M1IPg<jI|&q4>M
z{XB?V4|x=J__mZHeh`5}_YNGd-3BM*JFZjb-d<zVZ*H~F7R#>Zg?#^**$v%hgC7ss
z@ta(RU<xS`ycz4YRuFJ}Hl1cG;tpOEyB)c;XR^|N;-eT%y_Nlxi&dqd@%ZgiurZVg
z({D;u_^5kHkgi`7m>$0>;&rCyr~T70ijnbK+5);SoeTPHt7?8#@q_nT;Dg8slJ(O)
zB3i(quSxiOnvmrA?Pw=`*U^v^Zwk<ofr9J4_YqI3|4`H~>!kYW71HakBc`v35KIZM
zLW)AV?<U%k@_!Zi<vvh;dLQ)syNJ=6MI0)*A`$gRC7ECH7idh1{~#Q`slmdRAQ}Hk
z$a?;_;-|ep&I-vm$={$&%8DC&QvMpKxb91OlIx)W*G0e(`qBHR_m6t2-yMX&68)$9
Wt&*O97>!BsMe(S<Q-e{~<9`7cg5E>`

literal 0
HcmV?d00001

diff --git a/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
new file mode 100644
index 00000000..02e54955
--- /dev/null
+++ b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
@@ -0,0 +1,99 @@
+<abi-corpus version='2.2'>
+  <elf-function-symbols>
+    <!-- main -->
+    <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+  </elf-function-symbols>
+  <elf-variable-symbols>
+    <!-- pmc -->
+    <elf-symbol name='pmc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmcu -->
+    <elf-symbol name='pmcu' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmd -->
+    <elf-symbol name='pmd' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmf -->
+    <elf-symbol name='pmf' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmi -->
+    <elf-symbol name='pmi' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmu -->
+    <elf-symbol name='pmu' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <!-- pmy -->
+    <elf-symbol name='pmy' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+  </elf-variable-symbols>
+  <abi-instr address-size='64' path='test-pointer-to-member-1.cc' comp-dir-path='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf' language='LANG_C_plus_plus_14'>
+    <!-- char -->
+    <type-decl name='char' size-in-bits='8' id='type-id-1'/>
+    <!-- char Y::* -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-1' containing-type-id='type-id-2' id ='type-id-3'/>
+    <!-- double -->
+    <type-decl name='double' size-in-bits='64' id='type-id-4'/>
+    <!-- double X::* -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-4' containing-type-id='type-id-5' id ='type-id-6'/>
+    <!-- int -->
+    <type-decl name='int' size-in-bits='32' id='type-id-7'/>
+    <!-- int T::* -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-8' id ='type-id-9'/>
+    <!-- int U::* -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-10' id ='type-id-11'/>
+    <!-- int X::* -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-5' id ='type-id-12'/>
+    <!-- struct T -->
+    <class-decl name='T' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-8' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1' id='type-id-13'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int T::t -->
+        <var-decl name='t' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- struct X -->
+    <class-decl name='X' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='1' column='1' id='type-id-5'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <!-- int X::a -->
+        <var-decl name='a' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='3' column='1'/>
+      </data-member>
+    </class-decl>
+    <!-- typedef T T -->
+    <typedef-decl name='T' type-id='type-id-13' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1' id='type-id-8'/>
+    <!-- union U -->
+    <union-decl name='U' size-in-bits='32' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='20' column='1' id='type-id-10'>
+      <data-member access='public'>
+        <!-- int U::u -->
+        <var-decl name='u' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='20' column='1'/>
+      </data-member>
+    </union-decl>
+    <!-- void (X::*)(int) -->
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-14' containing-type-id='type-id-5' id ='type-id-15'/>
+    <!-- X* -->
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-16'/>
+    <!-- struct Y -->
+    <class-decl name='Y' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2'/>
+    <!-- int X::* pmi -->
+    <var-decl name='pmi' type-id='type-id-12' mangled-name='pmi' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='7' column='1' elf-symbol-id='pmi'/>
+    <!-- void -->
+    <type-decl name='void' id='type-id-17'/>
+    <!-- void (X::* pmf)(int) -->
+    <var-decl name='pmf' type-id='type-id-15' mangled-name='pmf' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='8' column='1' elf-symbol-id='pmf'/>
+    <!-- double X::* pmd -->
+    <var-decl name='pmd' type-id='type-id-6' mangled-name='pmd' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='9' column='1' elf-symbol-id='pmd'/>
+    <!-- char Y::* pmc -->
+    <var-decl name='pmc' type-id='type-id-3' mangled-name='pmc' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='10' column='1' elf-symbol-id='pmc'/>
+    <!-- int T::* pmy -->
+    <var-decl name='pmy' type-id='type-id-9' mangled-name='pmy' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='13' column='1' elf-symbol-id='pmy'/>
+    <!-- int U::* pmu -->
+    <var-decl name='pmu' type-id='type-id-11' mangled-name='pmu' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='21' column='1' elf-symbol-id='pmu'/>
+    <!-- int U::* pmcu -->
+    <var-decl name='pmcu' type-id='type-id-11' mangled-name='pmcu' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='24' column='1' elf-symbol-id='pmcu'/>
+    <!-- int main() -->
+    <function-decl name='main' mangled-name='main' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='27' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='main'>
+      <!-- int -->
+      <return type-id='type-id-7'/>
+    </function-decl>
+    <!-- void (int) -->
+    <function-type size-in-bits='64' method-class-id='type-id-5' id='type-id-14'>
+      <!-- implicit parameter of type 'X*' -->
+      <parameter type-id='type-id-16' is-artificial='yes'/>
+      <!-- parameter of type 'int' -->
+      <parameter type-id='type-id-7'/>
+      <!-- void -->
+      <return type-id='type-id-17'/>
+    </function-type>
+  </abi-instr>
+</abi-corpus>
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index a9115aa8..c90a38fd 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -144,17 +144,18 @@
     <type-decl name='double' size-in-bits='64' id='type-id-6'/>
     <type-decl name='float' size-in-bits='32' id='type-id-7'/>
     <type-decl name='int' size-in-bits='32' id='type-id-8'/>
-    <type-decl name='long double' size-in-bits='128' id='type-id-9'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-10'/>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-11'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-8' containing-type-id='type-id-9' id ='type-id-10'/>
+    <type-decl name='long double' size-in-bits='128' id='type-id-11'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-12'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-13'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-4'/>
-    <class-decl name='_G_fpos_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-12' visibility='default' id='type-id-13'/>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='type-id-14'/>
-    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-15' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-16'>
+    <class-decl name='_G_fpos_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-14' visibility='default' id='type-id-15'/>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='type-id-16'/>
+    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-17' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-18'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-17'>
+        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-19'>
           <data-member access='public'>
-            <var-decl name='__wch' type-id='type-id-18' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
+            <var-decl name='__wch' type-id='type-id-20' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
           <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-3' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
@@ -165,42 +166,42 @@
         <var-decl name='__count' type-id='type-id-8' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-17' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+        <var-decl name='__value' type-id='type-id-19' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-19'>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-21'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-18' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-20' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-18' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-20' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-20' visibility='default'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-20' visibility='default'/>
+        <var-decl name='reg_save_area' type-id='type-id-22' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='div_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-21' visibility='default' id='type-id-22'/>
-    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-23'/>
-    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-24' visibility='default' filepath='/usr/include/stdlib.h' line='105' column='1' id='type-id-25'>
+    <class-decl name='div_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-23' visibility='default' id='type-id-24'/>
+    <class-decl name='lconv' size-in-bits='768' is-struct='yes' visibility='default' id='type-id-25'/>
+    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-26' visibility='default' filepath='/usr/include/stdlib.h' line='105' column='1' id='type-id-27'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-10' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1'/>
+        <var-decl name='quot' type-id='type-id-12' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-10' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
+        <var-decl name='rem' type-id='type-id-12' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-26' visibility='default' filepath='/usr/include/stdlib.h' line='117' column='1' id='type-id-27'>
+    <class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-28' visibility='default' filepath='/usr/include/stdlib.h' line='117' column='1' id='type-id-29'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-11' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1'/>
+        <var-decl name='quot' type-id='type-id-13' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-11' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
+        <var-decl name='rem' type-id='type-id-13' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-28'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-30'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
@@ -229,235 +230,235 @@
         <var-decl name='tm_isdst' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='tm_gmtoff' type-id='type-id-10' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-12' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tm_zone' type-id='type-id-29' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
+        <var-decl name='tm_zone' type-id='type-id-31' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='FILE' type-id='type-id-14' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-30'/>
-    <typedef-decl name='_G_fpos_t' type-id='type-id-13' filepath='/usr/include/_G_config.h' line='25' column='1' id='type-id-12'/>
-    <typedef-decl name='__FILE' type-id='type-id-14' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-31'/>
-    <typedef-decl name='__clock_t' type-id='type-id-10' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-32'/>
-    <typedef-decl name='__compar_fn_t' type-id='type-id-33' filepath='/usr/include/stdlib.h' line='741' column='1' id='type-id-34'/>
-    <typedef-decl name='__int32_t' type-id='type-id-8' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1' id='type-id-35'/>
-    <typedef-decl name='__mbstate_t' type-id='type-id-16' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-15'/>
-    <typedef-decl name='__time_t' type-id='type-id-10' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-36'/>
-    <typedef-decl name='clock_t' type-id='type-id-32' filepath='/usr/include/time.h' line='59' column='1' id='type-id-37'/>
-    <typedef-decl name='div_t' type-id='type-id-22' filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-21'/>
-    <typedef-decl name='fpos_t' type-id='type-id-12' filepath='/usr/include/stdio.h' line='110' column='1' id='type-id-38'/>
-    <typedef-decl name='int_least32_t' type-id='type-id-8' filepath='/usr/include/stdint.h' line='67' column='1' id='type-id-39'/>
-    <typedef-decl name='intmax_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='134' column='1' id='type-id-40'/>
-    <typedef-decl name='ldiv_t' type-id='type-id-25' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-24'/>
-    <typedef-decl name='lldiv_t' type-id='type-id-27' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-26'/>
-    <typedef-decl name='mbstate_t' type-id='type-id-15' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-41'/>
-    <typedef-decl name='time_t' type-id='type-id-36' filepath='/usr/include/time.h' line='75' column='1' id='type-id-42'/>
-    <typedef-decl name='wctrans_t' type-id='type-id-43' filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-44'/>
-    <typedef-decl name='wctype_t' type-id='type-id-45' filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-46'/>
-    <typedef-decl name='wint_t' type-id='type-id-18' filepath='/usr/lib/llvm-3.9/bin/../lib/clang/3.9.1/include/stddef.h' line='132' column='1' id='type-id-47'/>
-    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-48'/>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-18'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-45'/>
-    <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-49'/>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-51'/>
-    <qualified-type-def type-id='type-id-51' restrict='yes' id='type-id-52'/>
-    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-53'/>
+    <typedef-decl name='FILE' type-id='type-id-16' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-32'/>
+    <typedef-decl name='_G_fpos_t' type-id='type-id-15' filepath='/usr/include/_G_config.h' line='25' column='1' id='type-id-14'/>
+    <typedef-decl name='__FILE' type-id='type-id-16' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-33'/>
+    <typedef-decl name='__clock_t' type-id='type-id-12' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-34'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-35' filepath='/usr/include/stdlib.h' line='741' column='1' id='type-id-36'/>
+    <typedef-decl name='__int32_t' type-id='type-id-8' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1' id='type-id-37'/>
+    <typedef-decl name='__mbstate_t' type-id='type-id-18' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-17'/>
+    <typedef-decl name='__time_t' type-id='type-id-12' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-38'/>
+    <typedef-decl name='clock_t' type-id='type-id-34' filepath='/usr/include/time.h' line='59' column='1' id='type-id-39'/>
+    <typedef-decl name='div_t' type-id='type-id-24' filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-23'/>
+    <typedef-decl name='fpos_t' type-id='type-id-14' filepath='/usr/include/stdio.h' line='110' column='1' id='type-id-40'/>
+    <typedef-decl name='int_least32_t' type-id='type-id-8' filepath='/usr/include/stdint.h' line='67' column='1' id='type-id-41'/>
+    <typedef-decl name='intmax_t' type-id='type-id-12' filepath='/usr/include/stdint.h' line='134' column='1' id='type-id-42'/>
+    <typedef-decl name='ldiv_t' type-id='type-id-27' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-26'/>
+    <typedef-decl name='lldiv_t' type-id='type-id-29' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-28'/>
+    <typedef-decl name='mbstate_t' type-id='type-id-17' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-43'/>
+    <typedef-decl name='time_t' type-id='type-id-38' filepath='/usr/include/time.h' line='75' column='1' id='type-id-44'/>
+    <typedef-decl name='wctrans_t' type-id='type-id-45' filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-46'/>
+    <typedef-decl name='wctype_t' type-id='type-id-47' filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-48'/>
+    <typedef-decl name='wint_t' type-id='type-id-20' filepath='/usr/lib/llvm-3.9/bin/../lib/clang/3.9.1/include/stddef.h' line='132' column='1' id='type-id-49'/>
+    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-50'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-20'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-47'/>
+    <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-51'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-52'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-53'/>
     <qualified-type-def type-id='type-id-53' restrict='yes' id='type-id-54'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-55'/>
-    <reference-type-def kind='lvalue' type-id='type-id-56' size-in-bits='64' id='type-id-57'/>
-    <reference-type-def kind='rvalue' type-id='type-id-56' size-in-bits='64' id='type-id-58'/>
-    <pointer-type-def type-id='type-id-56' size-in-bits='64' id='type-id-59'/>
-    <reference-type-def kind='lvalue' type-id='type-id-60' size-in-bits='64' id='type-id-61'/>
-    <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-62'/>
-    <reference-type-def kind='lvalue' type-id='type-id-63' size-in-bits='64' id='type-id-64'/>
-    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-65'/>
-    <reference-type-def kind='lvalue' type-id='type-id-66' size-in-bits='64' id='type-id-67'/>
-    <reference-type-def kind='rvalue' type-id='type-id-66' size-in-bits='64' id='type-id-68'/>
-    <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-69'/>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-71'/>
+    <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-55'/>
+    <qualified-type-def type-id='type-id-55' restrict='yes' id='type-id-56'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-57'/>
+    <reference-type-def kind='lvalue' type-id='type-id-58' size-in-bits='64' id='type-id-59'/>
+    <reference-type-def kind='rvalue' type-id='type-id-58' size-in-bits='64' id='type-id-60'/>
+    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-61'/>
+    <reference-type-def kind='lvalue' type-id='type-id-62' size-in-bits='64' id='type-id-63'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-64'/>
+    <reference-type-def kind='lvalue' type-id='type-id-65' size-in-bits='64' id='type-id-66'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-67'/>
+    <reference-type-def kind='lvalue' type-id='type-id-68' size-in-bits='64' id='type-id-69'/>
+    <reference-type-def kind='rvalue' type-id='type-id-68' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-71'/>
     <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-73'/>
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-75'/>
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-77'/>
     <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-79'/>
-    <reference-type-def kind='lvalue' type-id='type-id-80' size-in-bits='64' id='type-id-81'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-82'/>
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-84'/>
-    <reference-type-def kind='lvalue' type-id='type-id-85' size-in-bits='64' id='type-id-86'/>
-    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-87'/>
-    <reference-type-def kind='lvalue' type-id='type-id-88' size-in-bits='64' id='type-id-89'/>
-    <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-90'/>
-    <reference-type-def kind='lvalue' type-id='type-id-91' size-in-bits='64' id='type-id-92'/>
-    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-94'/>
-    <reference-type-def kind='lvalue' type-id='type-id-95' size-in-bits='64' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-97'/>
-    <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-99'/>
+    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-81'/>
+    <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-83'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-86'/>
+    <reference-type-def kind='lvalue' type-id='type-id-87' size-in-bits='64' id='type-id-88'/>
+    <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-89'/>
+    <reference-type-def kind='lvalue' type-id='type-id-90' size-in-bits='64' id='type-id-91'/>
+    <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-92'/>
+    <reference-type-def kind='lvalue' type-id='type-id-93' size-in-bits='64' id='type-id-94'/>
+    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-96'/>
+    <reference-type-def kind='lvalue' type-id='type-id-97' size-in-bits='64' id='type-id-98'/>
+    <pointer-type-def type-id='type-id-97' size-in-bits='64' id='type-id-99'/>
     <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-101'/>
     <pointer-type-def type-id='type-id-102' size-in-bits='64' id='type-id-103'/>
     <pointer-type-def type-id='type-id-104' size-in-bits='64' id='type-id-105'/>
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-107'/>
-    <reference-type-def kind='lvalue' type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
-    <reference-type-def kind='rvalue' type-id='type-id-108' size-in-bits='64' id='type-id-110'/>
-    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-111'/>
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
-    <reference-type-def kind='lvalue' type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
-    <reference-type-def kind='rvalue' type-id='type-id-114' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-120'/>
-    <qualified-type-def type-id='type-id-120' restrict='yes' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-122'/>
+    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
+    <reference-type-def kind='lvalue' type-id='type-id-110' size-in-bits='64' id='type-id-111'/>
+    <reference-type-def kind='rvalue' type-id='type-id-110' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-113'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
+    <reference-type-def kind='lvalue' type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
+    <reference-type-def kind='rvalue' type-id='type-id-116' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-119'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-122'/>
     <qualified-type-def type-id='type-id-122' restrict='yes' id='type-id-123'/>
-    <qualified-type-def type-id='type-id-35' const='yes' id='type-id-124'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-43'/>
-    <qualified-type-def type-id='type-id-56' const='yes' id='type-id-125'/>
-    <reference-type-def kind='lvalue' type-id='type-id-125' size-in-bits='64' id='type-id-126'/>
-    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-127'/>
-    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-128'/>
-    <reference-type-def kind='lvalue' type-id='type-id-128' size-in-bits='64' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-130'/>
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-131'/>
-    <reference-type-def kind='lvalue' type-id='type-id-131' size-in-bits='64' id='type-id-132'/>
-    <qualified-type-def type-id='type-id-66' const='yes' id='type-id-133'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-124'/>
+    <qualified-type-def type-id='type-id-124' restrict='yes' id='type-id-125'/>
+    <qualified-type-def type-id='type-id-37' const='yes' id='type-id-126'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-45'/>
+    <qualified-type-def type-id='type-id-58' const='yes' id='type-id-127'/>
+    <reference-type-def kind='lvalue' type-id='type-id-127' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-129'/>
+    <qualified-type-def type-id='type-id-62' const='yes' id='type-id-130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-132'/>
+    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-133'/>
     <reference-type-def kind='lvalue' type-id='type-id-133' size-in-bits='64' id='type-id-134'/>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-135'/>
-    <qualified-type-def type-id='type-id-70' const='yes' id='type-id-136'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-137'/>
+    <qualified-type-def type-id='type-id-68' const='yes' id='type-id-135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-137'/>
     <qualified-type-def type-id='type-id-72' const='yes' id='type-id-138'/>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
     <qualified-type-def type-id='type-id-74' const='yes' id='type-id-140'/>
-    <reference-type-def kind='lvalue' type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-142'/>
-    <qualified-type-def type-id='type-id-78' const='yes' id='type-id-143'/>
-    <reference-type-def kind='lvalue' type-id='type-id-143' size-in-bits='64' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
+    <qualified-type-def type-id='type-id-76' const='yes' id='type-id-142'/>
+    <reference-type-def kind='lvalue' type-id='type-id-142' size-in-bits='64' id='type-id-143'/>
+    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-144'/>
     <qualified-type-def type-id='type-id-80' const='yes' id='type-id-145'/>
     <reference-type-def kind='lvalue' type-id='type-id-145' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-147'/>
-    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-148'/>
-    <reference-type-def kind='lvalue' type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-147'/>
+    <reference-type-def kind='lvalue' type-id='type-id-147' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-149'/>
     <qualified-type-def type-id='type-id-85' const='yes' id='type-id-150'/>
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
-    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-152'/>
+    <reference-type-def kind='lvalue' type-id='type-id-150' size-in-bits='64' id='type-id-151'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-152'/>
     <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-153'/>
-    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-155'/>
-    <qualified-type-def type-id='type-id-95' const='yes' id='type-id-156'/>
-    <reference-type-def kind='lvalue' type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-158'/>
-    <qualified-type-def type-id='type-id-98' const='yes' id='type-id-159'/>
-    <reference-type-def kind='lvalue' type-id='type-id-159' size-in-bits='64' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-161'/>
-    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-163'/>
+    <qualified-type-def type-id='type-id-90' const='yes' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-157'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-158'/>
+    <reference-type-def kind='lvalue' type-id='type-id-158' size-in-bits='64' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-160'/>
+    <qualified-type-def type-id='type-id-100' const='yes' id='type-id-161'/>
+    <reference-type-def kind='lvalue' type-id='type-id-161' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-163'/>
     <qualified-type-def type-id='type-id-102' const='yes' id='type-id-164'/>
-    <reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
     <qualified-type-def type-id='type-id-104' const='yes' id='type-id-166'/>
     <reference-type-def kind='lvalue' type-id='type-id-166' size-in-bits='64' id='type-id-167'/>
     <qualified-type-def type-id='type-id-106' const='yes' id='type-id-168'/>
     <reference-type-def kind='lvalue' type-id='type-id-168' size-in-bits='64' id='type-id-169'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-170'/>
-    <qualified-type-def type-id='type-id-171' const='yes' id='type-id-172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
-    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-175'/>
-    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-176'/>
-    <reference-type-def kind='lvalue' type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-178'/>
-    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-179'/>
-    <reference-type-def kind='lvalue' type-id='type-id-179' size-in-bits='64' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-181'/>
-    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-182'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-29'/>
-    <qualified-type-def type-id='type-id-29' restrict='yes' id='type-id-183'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-184'/>
-    <qualified-type-def type-id='type-id-184' restrict='yes' id='type-id-185'/>
-    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-186'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-188'/>
+    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-170'/>
+    <reference-type-def kind='lvalue' type-id='type-id-170' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-172'/>
+    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-174'/>
+    <reference-type-def kind='lvalue' type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-177'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-178'/>
+    <reference-type-def kind='lvalue' type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-180'/>
+    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-181'/>
+    <reference-type-def kind='lvalue' type-id='type-id-181' size-in-bits='64' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-183'/>
+    <qualified-type-def type-id='type-id-2' const='yes' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-31'/>
+    <qualified-type-def type-id='type-id-31' restrict='yes' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-186'/>
+    <qualified-type-def type-id='type-id-186' restrict='yes' id='type-id-187'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-188'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
-    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-191'/>
-    <reference-type-def kind='lvalue' type-id='type-id-191' size-in-bits='64' id='type-id-192'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-193'/>
-    <qualified-type-def type-id='type-id-194' const='yes' id='type-id-195'/>
-    <reference-type-def kind='lvalue' type-id='type-id-195' size-in-bits='64' id='type-id-196'/>
-    <qualified-type-def type-id='type-id-197' const='yes' id='type-id-198'/>
-    <reference-type-def kind='lvalue' type-id='type-id-198' size-in-bits='64' id='type-id-199'/>
-    <qualified-type-def type-id='type-id-200' const='yes' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
-    <qualified-type-def type-id='type-id-203' const='yes' id='type-id-204'/>
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
-    <qualified-type-def type-id='type-id-206' const='yes' id='type-id-207'/>
-    <reference-type-def kind='lvalue' type-id='type-id-207' size-in-bits='64' id='type-id-208'/>
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-209'/>
-    <qualified-type-def type-id='type-id-210' const='yes' id='type-id-211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-211' size-in-bits='64' id='type-id-212'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-213'/>
-    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
-    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-215'/>
+    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
+    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-193'/>
+    <reference-type-def kind='lvalue' type-id='type-id-193' size-in-bits='64' id='type-id-194'/>
+    <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-195'/>
+    <qualified-type-def type-id='type-id-196' const='yes' id='type-id-197'/>
+    <reference-type-def kind='lvalue' type-id='type-id-197' size-in-bits='64' id='type-id-198'/>
+    <qualified-type-def type-id='type-id-199' const='yes' id='type-id-200'/>
+    <reference-type-def kind='lvalue' type-id='type-id-200' size-in-bits='64' id='type-id-201'/>
+    <qualified-type-def type-id='type-id-202' const='yes' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-204'/>
+    <qualified-type-def type-id='type-id-205' const='yes' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
+    <qualified-type-def type-id='type-id-208' const='yes' id='type-id-209'/>
+    <reference-type-def kind='lvalue' type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-211'/>
+    <qualified-type-def type-id='type-id-212' const='yes' id='type-id-213'/>
+    <reference-type-def kind='lvalue' type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-215'/>
     <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
-    <qualified-type-def type-id='type-id-216' restrict='yes' id='type-id-217'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-219' restrict='yes' id='type-id-220'/>
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-221'/>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-218'/>
+    <qualified-type-def type-id='type-id-218' restrict='yes' id='type-id-219'/>
+    <qualified-type-def type-id='type-id-52' const='yes' id='type-id-220'/>
+    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
     <qualified-type-def type-id='type-id-221' restrict='yes' id='type-id-222'/>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-223'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-224'/>
-    <qualified-type-def type-id='type-id-224' restrict='yes' id='type-id-225'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-33'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-228'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-229'/>
-    <qualified-type-def type-id='type-id-229' restrict='yes' id='type-id-230'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-231'/>
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-232'/>
-    <reference-type-def kind='lvalue' type-id='type-id-206' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-234'/>
-    <pointer-type-def type-id='type-id-42' size-in-bits='64' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-236'/>
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-238'/>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-239'/>
-    <qualified-type-def type-id='type-id-239' restrict='yes' id='type-id-240'/>
-    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-223'/>
+    <qualified-type-def type-id='type-id-223' restrict='yes' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-226'/>
+    <qualified-type-def type-id='type-id-226' restrict='yes' id='type-id-227'/>
+    <pointer-type-def type-id='type-id-228' size-in-bits='64' id='type-id-35'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-229'/>
+    <pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-230'/>
+    <pointer-type-def type-id='type-id-43' size-in-bits='64' id='type-id-231'/>
+    <qualified-type-def type-id='type-id-231' restrict='yes' id='type-id-232'/>
+    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-234'/>
+    <reference-type-def kind='lvalue' type-id='type-id-208' size-in-bits='64' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-236'/>
+    <pointer-type-def type-id='type-id-44' size-in-bits='64' id='type-id-237'/>
+    <pointer-type-def type-id='type-id-30' size-in-bits='64' id='type-id-238'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-52' size-in-bits='64' id='type-id-241'/>
     <qualified-type-def type-id='type-id-241' restrict='yes' id='type-id-242'/>
-    <qualified-type-def type-id='type-id-243' const='yes' id='type-id-244'/>
-    <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
-    <qualified-type-def type-id='type-id-20' restrict='yes' id='type-id-246'/>
-    <qualified-type-def type-id='type-id-20' restrict='yes' id='type-id-247'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-243'/>
+    <qualified-type-def type-id='type-id-243' restrict='yes' id='type-id-244'/>
+    <qualified-type-def type-id='type-id-245' const='yes' id='type-id-246'/>
+    <reference-type-def kind='lvalue' type-id='type-id-246' size-in-bits='64' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-22' restrict='yes' id='type-id-248'/>
+    <qualified-type-def type-id='type-id-22' restrict='yes' id='type-id-249'/>
     <namespace-decl name='std'>
-      <class-decl name='fpos&lt;__mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='112' column='1' id='type-id-206'>
+      <class-decl name='fpos&lt;__mbstate_t&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='112' column='1' id='type-id-208'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_off' type-id='type-id-248' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='115' column='1'/>
+          <var-decl name='_M_off' type-id='type-id-250' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='115' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_state' type-id='type-id-16' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='116' column='1'/>
+          <var-decl name='_M_state' type-id='type-id-18' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='116' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='fpos' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-234' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fpos' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-234' is-artificial='yes'/>
-            <parameter type-id='type-id-248'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-236' is-artificial='yes'/>
+            <parameter type-id='type-id-250'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' id='type-id-250'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' id='type-id-252'>
         <member-type access='private'>
-          <class-decl name='failure' size-in-bits='256' visibility='default' id='type-id-210'/>
+          <class-decl name='failure' size-in-bits='256' visibility='default' id='type-id-212'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-252' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-251'/>
+          <typedef-decl name='openmode' type-id='type-id-254' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-253'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='seekdir' type-id='type-id-254' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='461' column='1' id='type-id-253'/>
+          <typedef-decl name='seekdir' type-id='type-id-256' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='461' column='1' id='type-id-255'/>
         </member-type>
       </class-decl>
-      <class-decl name='system_error' size-in-bits='256' visibility='default' id='type-id-255'/>
-      <enum-decl name='_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='111' column='1' id='type-id-252'>
-        <underlying-type type-id='type-id-48'/>
+      <class-decl name='system_error' size-in-bits='256' visibility='default' id='type-id-257'/>
+      <enum-decl name='_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='111' column='1' id='type-id-254'>
+        <underlying-type type-id='type-id-50'/>
         <enumerator name='_S_app' value='1'/>
         <enumerator name='_S_ate' value='2'/>
         <enumerator name='_S_bin' value='4'/>
@@ -468,82 +469,82 @@
         <enumerator name='_S_ios_openmode_max' value='2147483647'/>
         <enumerator name='_S_ios_openmode_min' value='-2147483648'/>
       </enum-decl>
-      <enum-decl name='_Ios_Seekdir' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='193' column='1' id='type-id-254'>
-        <underlying-type type-id='type-id-48'/>
+      <enum-decl name='_Ios_Seekdir' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='193' column='1' id='type-id-256'>
+        <underlying-type type-id='type-id-50'/>
         <enumerator name='_S_beg' value='0'/>
         <enumerator name='_S_cur' value='1'/>
         <enumerator name='_S_end' value='2'/>
         <enumerator name='_S_ios_seekdir_end' value='65536'/>
       </enum-decl>
-      <enum-decl name='io_errc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='203' column='1' id='type-id-256'>
-        <underlying-type type-id='type-id-48'/>
+      <enum-decl name='io_errc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='203' column='1' id='type-id-258'>
+        <underlying-type type-id='type-id-50'/>
         <enumerator name='stream' value='1'/>
       </enum-decl>
-      <class-decl name='error_code' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='138' column='1' id='type-id-200'>
+      <class-decl name='error_code' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='138' column='1' id='type-id-202'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_value' type-id='type-id-8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='190' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_cat' type-id='type-id-193' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='191' column='1'/>
+          <var-decl name='_M_cat' type-id='type-id-195' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='191' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='error_code' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-231' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-233' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='error_code' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-231' is-artificial='yes'/>
+            <parameter type-id='type-id-233' is-artificial='yes'/>
             <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-192'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-194'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='error_code&lt;std::io_errc, void&gt;' mangled-name='_ZNSt10error_codeC2ISt7io_errcvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-231' is-artificial='yes'/>
-            <parameter type-id='type-id-256'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-233' is-artificial='yes'/>
+            <parameter type-id='type-id-258'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='error_condition' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='216' column='1' id='type-id-203'>
+      <class-decl name='error_condition' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='216' column='1' id='type-id-205'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_value' type-id='type-id-8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='264' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_cat' type-id='type-id-193' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='265' column='1'/>
+          <var-decl name='_M_cat' type-id='type-id-195' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='265' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='error_condition' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-232' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-234' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='error_condition' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/system_error' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-232' is-artificial='yes'/>
+            <parameter type-id='type-id-234' is-artificial='yes'/>
             <parameter type-id='type-id-8'/>
-            <parameter type-id='type-id-192'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-194'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-10' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='197' column='1' id='type-id-257'/>
-      <typedef-decl name='size_t' type-id='type-id-45' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='196' column='1' id='type-id-258'/>
-      <typedef-decl name='streamoff' type-id='type-id-10' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='88' column='1' id='type-id-248'/>
-      <typedef-decl name='streampos' type-id='type-id-206' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='228' column='1' id='type-id-259'/>
-      <typedef-decl name='streamsize' type-id='type-id-257' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='98' column='1' id='type-id-260'/>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-261'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-12' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='197' column='1' id='type-id-259'/>
+      <typedef-decl name='size_t' type-id='type-id-47' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/x86_64-linux-gnu/c++/5.4.0/bits/c++config.h' line='196' column='1' id='type-id-260'/>
+      <typedef-decl name='streamoff' type-id='type-id-12' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='88' column='1' id='type-id-250'/>
+      <typedef-decl name='streampos' type-id='type-id-208' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='228' column='1' id='type-id-261'/>
+      <typedef-decl name='streamsize' type-id='type-id-259' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='98' column='1' id='type-id-262'/>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-263'/>
       <namespace-decl name='_V2'>
-        <class-decl name='error_category' size-in-bits='64' visibility='default' id='type-id-190'/>
+        <class-decl name='error_category' size-in-bits='64' visibility='default' id='type-id-192'/>
       </namespace-decl>
       <namespace-decl name='__cxx11'>
-        <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' id='type-id-262'/>
-        <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='256' visibility='default' id='type-id-263'/>
-        <typedef-decl name='string' type-id='type-id-262' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='74' column='1' id='type-id-194'/>
-        <typedef-decl name='wstring' type-id='type-id-263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='78' column='1' id='type-id-197'/>
+        <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='256' visibility='default' id='type-id-264'/>
+        <class-decl name='basic_string&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='256' visibility='default' id='type-id-265'/>
+        <typedef-decl name='string' type-id='type-id-264' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='74' column='1' id='type-id-196'/>
+        <typedef-decl name='wstring' type-id='type-id-265' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='78' column='1' id='type-id-199'/>
       </namespace-decl>
     </namespace-decl>
     <function-decl name='isalnum' filepath='/usr/include/ctype.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -604,147 +605,147 @@
     </function-decl>
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-230'/>
     </function-decl>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='rename' filepath='/usr/include/stdio.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='tmpfile' filepath='/usr/include/stdio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-51'/>
+      <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='tmpnam' filepath='/usr/include/stdio.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-120'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-122'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='fclose' filepath='/usr/include/stdio.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fflush' filepath='/usr/include/stdio.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fopen' filepath='/usr/include/stdio.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-183'/>
-      <return type-id='type-id-51'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-185'/>
+      <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='freopen' filepath='/usr/include/stdio.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-52'/>
-      <return type-id='type-id-51'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-53'/>
     </function-decl>
     <function-decl name='setbuf' filepath='/usr/include/stdio.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-121'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-123'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='setvbuf' filepath='/usr/include/stdio.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-121'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='printf' filepath='/usr/include/stdio.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='sprintf' filepath='/usr/include/stdio.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vprintf' filepath='/usr/include/stdio.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vsprintf' filepath='/usr/include/stdio.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vsnprintf' filepath='/usr/include/stdio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='scanf' filepath='/usr/include/stdio.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='sscanf' filepath='/usr/include/stdio.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-183'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-185'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vfscanf' filepath='/usr/include/stdio.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vscanf' filepath='/usr/include/stdio.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vsscanf' filepath='/usr/include/stdio.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fgetc' filepath='/usr/include/stdio.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='getc' filepath='/usr/include/stdio.h' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='getchar' filepath='/usr/include/stdio.h' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -752,12 +753,12 @@
     </function-decl>
     <function-decl name='fputc' filepath='/usr/include/stdio.h' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='putc' filepath='/usr/include/stdio.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='putchar' filepath='/usr/include/stdio.h' line='580' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -765,810 +766,810 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fgets' filepath='/usr/include/stdio.h' line='622' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
+      <parameter type-id='type-id-123'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-52'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='fputs' filepath='/usr/include/stdio.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-54'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='puts' filepath='/usr/include/stdio.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='ungetc' filepath='/usr/include/stdio.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fread' filepath='/usr/include/stdio.h' line='709' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-246'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-52'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='fwrite' filepath='/usr/include/stdio.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-52'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-54'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='fseek' filepath='/usr/include/stdio.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-12'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='ftell' filepath='/usr/include/stdio.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-10'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='rewind' filepath='/usr/include/stdio.h' line='759' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-225'/>
+      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-227'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
-      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-189'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='feof' filepath='/usr/include/stdio.h' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='ferror' filepath='/usr/include/stdio.h' line='830' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-51'/>
+      <parameter type-id='type-id-53'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='perror' filepath='/usr/include/stdio.h' line='846' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='atof' filepath='/usr/include/stdlib.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='atoi' filepath='/usr/include/stdlib.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='atol' filepath='/usr/include/stdlib.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-10'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='atoll' filepath='/usr/include/stdlib.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='strtod' filepath='/usr/include/stdlib.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='strtof' filepath='/usr/include/stdlib.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='strtold' filepath='/usr/include/stdlib.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-45'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-125'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-49'/>
+      <return type-id='type-id-51'/>
     </function-decl>
     <function-decl name='rand' filepath='/usr/include/stdlib.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='srand' filepath='/usr/include/stdlib.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-18'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-20'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='480' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-22'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
+      <parameter type-id='type-id-240'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='/usr/include/stdlib.h' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
+      <parameter type-id='type-id-240'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='exit' filepath='/usr/include/stdlib.h' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='/usr/include/stdlib.h' line='549' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='_Exit' filepath='/usr/include/stdlib.h' line='557' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-249'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='564' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='system' filepath='/usr/include/stdlib.h' line='716' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-34'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-36'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-34'/>
-      <return type-id='type-id-249'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-36'/>
+      <return type-id='type-id-251'/>
     </function-decl>
     <function-decl name='abs' filepath='/usr/include/stdlib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='labs' filepath='/usr/include/stdlib.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-10'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='llabs' filepath='/usr/include/stdlib.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-11'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='div' filepath='/usr/include/stdlib.h' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-21'/>
+      <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='ldiv' filepath='/usr/include/stdlib.h' line='790' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-24'/>
+      <parameter type-id='type-id-12'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='lldiv' filepath='/usr/include/stdlib.h' line='796' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-11'/>
-      <return type-id='type-id-26'/>
+      <parameter type-id='type-id-13'/>
+      <parameter type-id='type-id-13'/>
+      <return type-id='type-id-28'/>
     </function-decl>
     <function-decl name='mblen' filepath='/usr/include/stdlib.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='mbtowc' filepath='/usr/include/stdlib.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wctomb' filepath='/usr/include/stdlib.h' line='869' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-120'/>
-      <parameter type-id='type-id-50'/>
+      <parameter type-id='type-id-122'/>
+      <parameter type-id='type-id-52'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='memcpy' filepath='/usr/include/string.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-246'/>
-      <parameter type-id='type-id-247'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-249'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='memmove' filepath='/usr/include/string.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='memset' filepath='/usr/include/string.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='memcmp' filepath='/usr/include/string.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/include/string.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-20'/>
+      <parameter type-id='type-id-22'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-20'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='strcpy' filepath='/usr/include/string.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strncpy' filepath='/usr/include/string.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strcat' filepath='/usr/include/string.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strncat' filepath='/usr/include/string.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strcmp' filepath='/usr/include/string.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='strncmp' filepath='/usr/include/string.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='strcoll' filepath='/usr/include/string.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='strxfrm' filepath='/usr/include/string.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='strchr' filepath='/usr/include/string.h' line='231' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-120'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strrchr' filepath='/usr/include/string.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-120'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='strspn' filepath='/usr/include/string.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='strpbrk' filepath='/usr/include/string.h' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strstr' filepath='/usr/include/string.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-31'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strtok' filepath='/usr/include/string.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-183'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-185'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='strlen' filepath='/usr/include/string.h' line='394' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='strerror' filepath='/usr/include/string.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-120'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='clock' filepath='/usr/include/time.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-37'/>
+      <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='time' filepath='/usr/include/time.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-235'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-237'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='difftime' filepath='/usr/include/time.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='mktime' filepath='/usr/include/time.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-236'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-238'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-217'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-219'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-214'/>
-      <return type-id='type-id-236'/>
+      <parameter type-id='type-id-216'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-214'/>
-      <return type-id='type-id-236'/>
+      <parameter type-id='type-id-216'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-216'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-218'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-214'/>
-      <return type-id='type-id-120'/>
+      <parameter type-id='type-id-216'/>
+      <return type-id='type-id-122'/>
     </function-decl>
     <function-decl name='wcscpy' filepath='/usr/include/wchar.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcsncpy' filepath='/usr/include/wchar.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcsncat' filepath='/usr/include/wchar.h' line='161' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcschr' filepath='/usr/include/wchar.h' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-50'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-52'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcsrchr' filepath='/usr/include/wchar.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-50'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-52'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcspbrk' filepath='/usr/include/wchar.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcsstr' filepath='/usr/include/wchar.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='285' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
       <parameter type-id='type-id-242'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='290' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-221'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wmemchr' filepath='/usr/include/wchar.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-260'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wmemcpy' filepath='/usr/include/wchar.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wmemmove' filepath='/usr/include/wchar.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-239'/>
-      <parameter type-id='type-id-219'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='wmemset' filepath='/usr/include/wchar.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-239'/>
-      <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-258'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-241'/>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-260'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-47'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='wctob' filepath='/usr/include/wchar.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-189'/>
+      <parameter type-id='type-id-191'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-230'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-232'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-230'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-232'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-183'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-230'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-185'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-232'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-185'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-230'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-187'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-232'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='417' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-121'/>
-      <parameter type-id='type-id-222'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-230'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-123'/>
+      <parameter type-id='type-id-224'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-232'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='453' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='462' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-45'/>
+      <return type-id='type-id-47'/>
     </function-decl>
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='486' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-244'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-49'/>
+      <return type-id='type-id-51'/>
     </function-decl>
     <function-decl name='fwide' filepath='/usr/include/wchar.h' line='590' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-53'/>
+      <parameter type-id='type-id-55'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-54'/>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-56'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='607' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-54'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-56'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-54'/>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-56'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wscanf' filepath='/usr/include/wchar.h' line='645' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='swscanf' filepath='/usr/include/wchar.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-222'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-54'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-56'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='704' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-55'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='748' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-55'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='getwc' filepath='/usr/include/wchar.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-55'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='getwchar' filepath='/usr/include/wchar.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-47'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='fputwc' filepath='/usr/include/wchar.h' line='762' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-55'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='putwc' filepath='/usr/include/wchar.h' line='763' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-50'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-55'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='putwchar' filepath='/usr/include/wchar.h' line='769' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-50'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-52'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='fgetws' filepath='/usr/include/wchar.h' line='777' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-242'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-54'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-56'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='784' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-54'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-56'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='ungetwc' filepath='/usr/include/wchar.h' line='792' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <parameter type-id='type-id-53'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-55'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-240'/>
-      <parameter type-id='type-id-258'/>
-      <parameter type-id='type-id-220'/>
-      <parameter type-id='type-id-217'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-260'/>
+      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-219'/>
+      <return type-id='type-id-260'/>
     </function-decl>
     <function-decl name='iswalnum' filepath='/usr/include/wctype.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswalpha' filepath='/usr/include/wctype.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswcntrl' filepath='/usr/include/wctype.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswdigit' filepath='/usr/include/wctype.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswgraph' filepath='/usr/include/wctype.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswlower' filepath='/usr/include/wctype.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswprint' filepath='/usr/include/wctype.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswpunct' filepath='/usr/include/wctype.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswspace' filepath='/usr/include/wctype.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswupper' filepath='/usr/include/wctype.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswxdigit' filepath='/usr/include/wctype.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='iswblank' filepath='/usr/include/wctype.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='wctype' filepath='/usr/include/wctype.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-46'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-48'/>
     </function-decl>
     <function-decl name='iswctype' filepath='/usr/include/wctype.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <parameter type-id='type-id-46'/>
+      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-48'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='towlower' filepath='/usr/include/wctype.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='towupper' filepath='/usr/include/wctype.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='wctrans' filepath='/usr/include/wctype.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-44'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-46'/>
     </function-decl>
     <function-decl name='towctrans' filepath='/usr/include/wctype.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-47'/>
-      <parameter type-id='type-id-44'/>
-      <return type-id='type-id-47'/>
+      <parameter type-id='type-id-49'/>
+      <parameter type-id='type-id-46'/>
+      <return type-id='type-id-49'/>
     </function-decl>
     <function-decl name='acos' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1620,8 +1621,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='acoshl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='asinh' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1632,8 +1633,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='asinhl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='atanh' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1644,8 +1645,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='atanhl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='exp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1653,7 +1654,7 @@
     </function-decl>
     <function-decl name='frexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-227'/>
+      <parameter type-id='type-id-229'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='ldexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1671,7 +1672,7 @@
     </function-decl>
     <function-decl name='modf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-223'/>
+      <parameter type-id='type-id-225'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='expm1' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1683,8 +1684,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='expm1l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='log1p' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1695,8 +1696,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='log1pl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='logb' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1707,8 +1708,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='logbl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='exp2' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1719,8 +1720,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='exp2l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='log2' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1731,8 +1732,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='log2l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='pow' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1754,9 +1755,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='hypotl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='cbrt' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1767,8 +1768,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='cbrtl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='ceil' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1798,21 +1799,21 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='copysignl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='nan' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='nanf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
+      <parameter type-id='type-id-31'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='nanl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-29'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-31'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='erf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1823,8 +1824,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='erfl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='erfc' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1835,8 +1836,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='erfcl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='lgamma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1847,8 +1848,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='lgammal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='tgamma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1859,8 +1860,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='tgammal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='rint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1871,8 +1872,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='rintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='nextafter' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1885,24 +1886,24 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='nextafterl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='nexttoward' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='nexttowardf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='nexttowardl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='remainder' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1915,9 +1916,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='remainderl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='scalbn' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='302' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1930,9 +1931,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='scalbnl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='302' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-9'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='ilogb' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1943,23 +1944,23 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='ilogbl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='306' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='scalbln' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-12'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='scalblnf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <parameter type-id='type-id-10'/>
+      <parameter type-id='type-id-12'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='scalblnl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='311' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-10'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-12'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='nearbyint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1970,8 +1971,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='nearbyintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='round' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1982,8 +1983,8 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='roundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='319' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='trunc' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -1994,74 +1995,74 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='truncl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='remquo' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-227'/>
+      <parameter type-id='type-id-229'/>
       <return type-id='type-id-6'/>
     </function-decl>
     <function-decl name='remquof' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
       <parameter type-id='type-id-7'/>
-      <parameter type-id='type-id-227'/>
+      <parameter type-id='type-id-229'/>
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='remquol' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-227'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-229'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='lrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='lrintf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='lrintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-10'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='llrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='llrintf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='llrintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='lround' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='lroundf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <return type-id='type-id-10'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='lroundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-10'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-12'/>
     </function-decl>
     <function-decl name='llround' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='llroundf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-7'/>
-      <return type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='llroundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-13'/>
     </function-decl>
     <function-decl name='fdim' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -2074,9 +2075,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='fdiml' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='fmax' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -2089,9 +2090,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='fmaxl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='fmin' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -2104,9 +2105,9 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='fminl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <function-decl name='fma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
@@ -2121,661 +2122,661 @@
       <return type-id='type-id-7'/>
     </function-decl>
     <function-decl name='fmal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <parameter type-id='type-id-9'/>
-      <return type-id='type-id-9'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <parameter type-id='type-id-11'/>
+      <return type-id='type-id-11'/>
     </function-decl>
     <namespace-decl name='boost'>
-      <class-decl name='exception' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='208' column='1' id='type-id-70'>
+      <class-decl name='exception' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='208' column='1' id='type-id-72'>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='data_' type-id='type-id-80' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='269' column='1'/>
+          <var-decl name='data_' type-id='type-id-82' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='269' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='throw_function_' type-id='type-id-29' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='270' column='1'/>
+          <var-decl name='throw_function_' type-id='type-id-31' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='270' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='throw_file_' type-id='type-id-29' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='271' column='1'/>
+          <var-decl name='throw_file_' type-id='type-id-31' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='271' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
           <var-decl name='throw_line_' type-id='type-id-8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='272' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='exception' mangled-name='_ZN5boost9exceptionC2Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-71' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-73' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='0'>
           <function-decl name='~exception' mangled-name='_ZN5boost9exceptionD2Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-71' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-73' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-108'>
+      <class-decl name='shared_ptr&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-110'>
         <member-type access='private'>
-          <typedef-decl name='element_type' type-id='type-id-264' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-112'/>
+          <typedef-decl name='element_type' type-id='type-id-266' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-114'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='px' type-id='type-id-113' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='768' column='1'/>
+          <var-decl name='px' type-id='type-id-115' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='768' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='pn' type-id='type-id-56' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='769' column='1'/>
+          <var-decl name='pn' type-id='type-id-58' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='769' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <parameter type-id='type-id-177'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <parameter type-id='type-id-179'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='608' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <parameter type-id='type-id-110'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <parameter type-id='type-id-112'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='shared_ptr&lt;boost::iostreams::detail::file_descriptor_impl&gt;' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEEC2IS3_EEPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <parameter type-id='type-id-87'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <parameter type-id='type-id-89'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEEptEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='691' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-178' is-artificial='yes'/>
-            <return type-id='type-id-265'/>
+            <parameter type-id='type-id-180' is-artificial='yes'/>
+            <return type-id='type-id-267'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <parameter type-id='type-id-109'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <parameter type-id='type-id-111'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reset&lt;boost::iostreams::detail::file_descriptor_impl&gt;' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEE5resetIS3_EEvPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10shared_ptrINS_9iostreams6detail20file_descriptor_implEE5resetIS3_EEvPT_'>
-            <parameter type-id='type-id-111' is-artificial='yes'/>
-            <parameter type-id='type-id-87'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-113' is-artificial='yes'/>
+            <parameter type-id='type-id-89'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='detail'>
-        <class-decl name='sp_counted_impl_p&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='53' column='1' id='type-id-63'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-60'/>
+        <class-decl name='sp_counted_impl_p&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='53' column='1' id='type-id-65'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-62'/>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='px_' type-id='type-id-87' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='57' column='1'/>
+            <var-decl name='px_' type-id='type-id-89' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='57' column='1'/>
           </data-member>
           <member-function access='private'>
             <function-decl name='sp_counted_impl_p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-65' is-artificial='yes'/>
-              <parameter type-id='type-id-132'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-67' is-artificial='yes'/>
+              <parameter type-id='type-id-134'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='sp_counted_impl_p' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail20file_descriptor_implEEC2EPS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-65' is-artificial='yes'/>
-              <parameter type-id='type-id-87'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-67' is-artificial='yes'/>
+              <parameter type-id='type-id-89'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='dispose' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail20file_descriptor_implEE7disposeEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-65' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-67' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='get_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail20file_descriptor_implEE11get_deleterERKSt9type_info' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-65' is-artificial='yes'/>
-              <parameter type-id='type-id-245'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-67' is-artificial='yes'/>
+              <parameter type-id='type-id-247'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='get_untyped_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail20file_descriptor_implEE19get_untyped_deleterEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-65' is-artificial='yes'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-67' is-artificial='yes'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='sp_array_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-266'>
+        <class-decl name='sp_array_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-268'>
         </class-decl>
-        <class-decl name='sp_dereference&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-267'>
+        <class-decl name='sp_dereference&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-269'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-86' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-268'/>
+            <typedef-decl name='type' type-id='type-id-88' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-270'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_element&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-269'>
+        <class-decl name='sp_element&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-271'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-85' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-264'/>
+            <typedef-decl name='type' type-id='type-id-87' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-266'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_member_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-270'>
+        <class-decl name='sp_member_access&lt;boost::iostreams::detail::file_descriptor_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-272'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-87' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-265'/>
+            <typedef-decl name='type' type-id='type-id-89' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-267'/>
           </member-type>
         </class-decl>
         <function-decl name='sp_enable_shared_from_this' mangled-name='_ZN5boost6detail26sp_enable_shared_from_thisEz' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail26sp_enable_shared_from_thisEz'>
           <parameter is-variadic='yes'/>
-          <return type-id='type-id-249'/>
+          <return type-id='type-id-251'/>
         </function-decl>
         <function-decl name='sp_pointer_construct&lt;boost::iostreams::detail::file_descriptor_impl, boost::iostreams::detail::file_descriptor_impl&gt;' mangled-name='_ZN5boost6detail20sp_pointer_constructINS_9iostreams6detail20file_descriptor_implES4_EEvPNS_10shared_ptrIT_EEPT0_RNS0_12shared_countE' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail20sp_pointer_constructINS_9iostreams6detail20file_descriptor_implES4_EEvPNS_10shared_ptrIT_EEPT0_RNS0_12shared_countE'>
-          <parameter type-id='type-id-111' name='ppx' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <parameter type-id='type-id-87' name='p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <parameter type-id='type-id-57' name='pn' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <return type-id='type-id-249'/>
+          <parameter type-id='type-id-113' name='ppx' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <parameter type-id='type-id-89' name='p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <parameter type-id='type-id-59' name='pn' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <return type-id='type-id-251'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='exception_detail'>
-        <class-decl name='clone_base' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='398' column='1' id='type-id-72'>
+        <class-decl name='clone_base' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='398' column='1' id='type-id-74'>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~clone_base' mangled-name='_ZN5boost16exception_detail10clone_baseD0Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='406' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-73' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-75' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='0'>
             <function-decl name='clone' mangled-name='_ZNK5boost16exception_detail10clone_base5cloneEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-139' is-artificial='yes'/>
-              <return type-id='type-id-139'/>
+              <parameter type-id='type-id-141' is-artificial='yes'/>
+              <return type-id='type-id-141'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='1'>
             <function-decl name='rethrow' mangled-name='_ZNK5boost16exception_detail10clone_base7rethrowEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='403' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-139' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-141' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='clone_impl&lt;boost::exception_detail::error_info_injector&lt;std::ios_base::failure&gt; &gt;' size-in-bits='640' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='442' column='1' id='type-id-74'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-78'/>
-          <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-72'/>
+        <class-decl name='clone_impl&lt;boost::exception_detail::error_info_injector&lt;std::ios_base::failure&gt; &gt;' size-in-bits='640' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='442' column='1' id='type-id-76'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-80'/>
+          <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-74'/>
           <member-type access='private'>
-            <class-decl name='clone_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='446' column='1' id='type-id-271'/>
+            <class-decl name='clone_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='446' column='1' id='type-id-273'/>
           </member-type>
           <member-function access='private'>
             <function-decl name='clone_impl' mangled-name='_ZN5boost16exception_detail10clone_implINS0_19error_info_injectorINSt8ios_base7failureB5cxx11EEEEC1ERKS6_NS6_9clone_tagE' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='447' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-75' is-artificial='yes'/>
-              <parameter type-id='type-id-141'/>
-              <parameter type-id='type-id-271'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-77' is-artificial='yes'/>
+              <parameter type-id='type-id-143'/>
+              <parameter type-id='type-id-273'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='clone_impl' mangled-name='_ZN5boost16exception_detail10clone_implINS0_19error_info_injectorINSt8ios_base7failureB5cxx11EEEEC1ERKS5_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='456' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-75' is-artificial='yes'/>
-              <parameter type-id='type-id-144'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-77' is-artificial='yes'/>
+              <parameter type-id='type-id-146'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~clone_impl' mangled-name='_ZN5boost16exception_detail10clone_implINS0_19error_info_injectorINSt8ios_base7failureB5cxx11EEEED0Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='462' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-75' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-77' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private' vtable-offset='3'>
             <function-decl name='clone' mangled-name='_ZNK5boost16exception_detail10clone_implINS0_19error_info_injectorINSt8ios_base7failureB5cxx11EEEE5cloneEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-142' is-artificial='yes'/>
-              <return type-id='type-id-139'/>
+              <parameter type-id='type-id-144' is-artificial='yes'/>
+              <return type-id='type-id-141'/>
             </function-decl>
           </member-function>
           <member-function access='private' vtable-offset='4'>
             <function-decl name='rethrow' mangled-name='_ZNK5boost16exception_detail10clone_implINS0_19error_info_injectorINSt8ios_base7failureB5cxx11EEEE7rethrowEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='475' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-142' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-144' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='refcount_ptr&lt;boost::exception_detail::error_info_container&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='23' column='1' id='type-id-80'>
+        <class-decl name='refcount_ptr&lt;boost::exception_detail::error_info_container&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='23' column='1' id='type-id-82'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='px_' type-id='type-id-77' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='66' column='1'/>
+            <var-decl name='px_' type-id='type-id-79' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='66' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='refcount_ptr' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='27' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~refcount_ptr' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEED2Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='32' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='refcount_ptr' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEEC2ERKS3_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='37' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <parameter type-id='type-id-146'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <parameter type-id='type-id-148'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='release' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEE7releaseEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='add_ref' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEE7add_refEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='get' mangled-name='_ZNK5boost16exception_detail12refcount_ptrINS0_20error_info_containerEE3getEv' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-147' is-artificial='yes'/>
-              <return type-id='type-id-77'/>
+              <parameter type-id='type-id-149' is-artificial='yes'/>
+              <return type-id='type-id-79'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEEaSERKS3_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <parameter type-id='type-id-146'/>
-              <return type-id='type-id-81'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <parameter type-id='type-id-148'/>
+              <return type-id='type-id-83'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='adopt' mangled-name='_ZN5boost16exception_detail12refcount_ptrINS0_20error_info_containerEE5adoptEPS2_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-82' is-artificial='yes'/>
-              <parameter type-id='type-id-77'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-84' is-artificial='yes'/>
+              <parameter type-id='type-id-79'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='error_info_container' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-76'/>
-        <class-decl name='error_info_injector&lt;std::ios_base::failure&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='326' column='1' id='type-id-78'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-210'/>
-          <base-class access='public' layout-offset-in-bits='256' type-id='type-id-70'/>
+        <class-decl name='error_info_container' size-in-bits='64' is-struct='yes' visibility='default' id='type-id-78'/>
+        <class-decl name='error_info_injector&lt;std::ios_base::failure&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='326' column='1' id='type-id-80'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-212'/>
+          <base-class access='public' layout-offset-in-bits='256' type-id='type-id-72'/>
           <member-function access='public'>
             <function-decl name='error_info_injector' mangled-name='_ZN5boost16exception_detail19error_info_injectorINSt8ios_base7failureB5cxx11EEC2ERKS3_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-79' is-artificial='yes'/>
-              <parameter type-id='type-id-212'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-81' is-artificial='yes'/>
+              <parameter type-id='type-id-214'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~error_info_injector' mangled-name='_ZN5boost16exception_detail19error_info_injectorINSt8ios_base7failureB5cxx11EED0Ev' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-79' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-81' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
         <function-decl name='copy_boost_exception' mangled-name='_ZN5boost16exception_detail20copy_boost_exceptionEPNS_9exceptionEPKS1_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost16exception_detail20copy_boost_exceptionEPNS_9exceptionEPKS1_'>
-          <parameter type-id='type-id-71' name='a' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='418' column='1'/>
-          <parameter type-id='type-id-137' name='b' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='418' column='1'/>
-          <return type-id='type-id-249'/>
+          <parameter type-id='type-id-73' name='a' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='418' column='1'/>
+          <parameter type-id='type-id-139' name='b' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='418' column='1'/>
+          <return type-id='type-id-251'/>
         </function-decl>
       </namespace-decl>
       <function-decl name='enable_current_exception&lt;boost::exception_detail::error_info_injector&lt;std::ios_base::failure&gt; &gt;' mangled-name='_ZN5boost24enable_current_exceptionINS_16exception_detail19error_info_injectorINSt8ios_base7failureB5cxx11EEEEENS1_10clone_implIT_EERKS7_' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='490' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost24enable_current_exceptionINS_16exception_detail19error_info_injectorINSt8ios_base7failureB5cxx11EEEEENS1_10clone_implIT_EERKS7_'>
-        <parameter type-id='type-id-144' name='x' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='490' column='1'/>
-        <return type-id='type-id-74'/>
+        <parameter type-id='type-id-146' name='x' filepath='src/third_party/boost-1.60.0/boost/exception/exception.hpp' line='490' column='1'/>
+        <return type-id='type-id-76'/>
       </function-decl>
       <namespace-decl name='iostreams'>
-        <class-decl name='file_descriptor' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='46' column='1' id='type-id-98'>
+        <class-decl name='file_descriptor' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='46' column='1' id='type-id-100'>
           <member-type access='private'>
-            <typedef-decl name='char_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='51' column='1' id='type-id-100'/>
+            <typedef-decl name='char_type' type-id='type-id-2' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='51' column='1' id='type-id-102'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='handle_type' type-id='type-id-273' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='50' column='1' id='type-id-272'/>
+            <typedef-decl name='handle_type' type-id='type-id-275' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='50' column='1' id='type-id-274'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='pimpl_' type-id='type-id-108' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='143' column='1'/>
+            <var-decl name='pimpl_' type-id='type-id-110' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='143' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor' mangled-name='_ZN5boost9iostreams15file_descriptorC2Ev' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptorC2Ev'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor' mangled-name='_ZN5boost9iostreams15file_descriptorC2EiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptorC2EiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-272'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
               <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-276'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor' mangled-name='_ZN5boost9iostreams15file_descriptorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptorC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor' mangled-name='_ZN5boost9iostreams15file_descriptorC2EPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptorC2EPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor' mangled-name='_ZN5boost9iostreams15file_descriptorC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptorC2ERKS1_'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-160'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-162'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams15file_descriptor4openEiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='98' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4openEiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-272'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
               <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-276'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams15file_descriptor4openERKNS0_6detail4pathESt13_Ios_OpenmodeS6_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4openERKNS0_6detail4pathESt13_Ios_OpenmodeS6_'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-157'/>
-              <parameter type-id='type-id-251'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-159'/>
+              <parameter type-id='type-id-253'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams15file_descriptor4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams15file_descriptor4openEPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4openEPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_open' mangled-name='_ZNK5boost9iostreams15file_descriptor7is_openEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams15file_descriptor7is_openEv'>
-              <parameter type-id='type-id-161' is-artificial='yes'/>
+              <parameter type-id='type-id-163' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='close' mangled-name='_ZN5boost9iostreams15file_descriptor5closeEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor5closeEv'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='read' mangled-name='_ZN5boost9iostreams15file_descriptor4readEPcl' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4readEPcl'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-101'/>
-              <parameter type-id='type-id-260'/>
-              <return type-id='type-id-260'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-103'/>
+              <parameter type-id='type-id-262'/>
+              <return type-id='type-id-262'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='write' mangled-name='_ZN5boost9iostreams15file_descriptor5writeEPKcl' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor5writeEPKcl'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-163'/>
-              <parameter type-id='type-id-260'/>
-              <return type-id='type-id-260'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-165'/>
+              <parameter type-id='type-id-262'/>
+              <return type-id='type-id-262'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='seek' mangled-name='_ZN5boost9iostreams15file_descriptor4seekElSt12_Ios_Seekdir' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4seekElSt12_Ios_Seekdir'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <parameter type-id='type-id-275'/>
-              <parameter type-id='type-id-253'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <parameter type-id='type-id-277'/>
+              <parameter type-id='type-id-255'/>
+              <return type-id='type-id-261'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='handle' mangled-name='_ZNK5boost9iostreams15file_descriptor6handleEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams15file_descriptor6handleEv'>
-              <parameter type-id='type-id-161' is-artificial='yes'/>
-              <return type-id='type-id-272'/>
+              <parameter type-id='type-id-163' is-artificial='yes'/>
+              <return type-id='type-id-274'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='init' mangled-name='_ZN5boost9iostreams15file_descriptor4initEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams15file_descriptor4initEv'>
-              <parameter type-id='type-id-99' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-101' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='file_descriptor_sink' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='228' column='1' id='type-id-102'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-98'/>
+        <class-decl name='file_descriptor_sink' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='228' column='1' id='type-id-104'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-100'/>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_sink' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_sink' mangled-name='_ZN5boost9iostreams20file_descriptor_sinkC2EiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sinkC2EiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-278'/>
               <parameter type-id='type-id-276'/>
-              <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_sink' mangled-name='_ZN5boost9iostreams20file_descriptor_sinkC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sinkC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_sink' mangled-name='_ZN5boost9iostreams20file_descriptor_sinkC2EPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sinkC2EPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_sink' mangled-name='_ZN5boost9iostreams20file_descriptor_sinkC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sinkC2ERKS1_'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-165'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-167'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams20file_descriptor_sink4openEiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sink4openEiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-278'/>
               <parameter type-id='type-id-276'/>
-              <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams20file_descriptor_sink4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sink4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams20file_descriptor_sink4openERKNS0_6detail4pathESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sink4openERKNS0_6detail4pathESt13_Ios_Openmode'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-157'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-159'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams20file_descriptor_sink4openEPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams20file_descriptor_sink4openEPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-103' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='file_descriptor_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='146' column='1' id='type-id-104'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-98'/>
+        <class-decl name='file_descriptor_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='146' column='1' id='type-id-106'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-100'/>
           <member-type access='private'>
-            <typedef-decl name='handle_type' type-id='type-id-8' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='151' column='1' id='type-id-276'/>
+            <typedef-decl name='handle_type' type-id='type-id-8' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='151' column='1' id='type-id-278'/>
           </member-type>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_source' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_source' mangled-name='_ZN5boost9iostreams22file_descriptor_sourceC2EiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_sourceC2EiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-278'/>
               <parameter type-id='type-id-276'/>
-              <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_source' mangled-name='_ZN5boost9iostreams22file_descriptor_sourceC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_sourceC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_source' mangled-name='_ZN5boost9iostreams22file_descriptor_sourceC2EPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_sourceC2EPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='file_descriptor_source' mangled-name='_ZN5boost9iostreams22file_descriptor_sourceC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_sourceC2ERKS1_'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-167'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-169'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams22file_descriptor_source4openEiNS0_21file_descriptor_flagsE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_source4openEiNS0_21file_descriptor_flagsE'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-278'/>
               <parameter type-id='type-id-276'/>
-              <parameter type-id='type-id-274'/>
-              <return type-id='type-id-249'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams22file_descriptor_source4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_source4openERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt13_Ios_Openmode'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-196'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-198'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams22file_descriptor_source4openERKNS0_6detail4pathESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_source4openERKNS0_6detail4pathESt13_Ios_Openmode'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-157'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-159'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='open' mangled-name='_ZN5boost9iostreams22file_descriptor_source4openEPKcSt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams22file_descriptor_source4openEPKcSt13_Ios_Openmode'>
-              <parameter type-id='type-id-105' is-artificial='yes'/>
-              <parameter type-id='type-id-29'/>
-              <parameter type-id='type-id-251'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-107' is-artificial='yes'/>
+              <parameter type-id='type-id-31'/>
+              <parameter type-id='type-id-253'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <enum-decl name='file_descriptor_flags' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='40' column='1' id='type-id-274'>
-          <underlying-type type-id='type-id-48'/>
+        <enum-decl name='file_descriptor_flags' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/file_descriptor.hpp' line='40' column='1' id='type-id-276'>
+          <underlying-type type-id='type-id-50'/>
           <enumerator name='never_close_handle' value='0'/>
           <enumerator name='close_handle' value='3'/>
         </enum-decl>
-        <typedef-decl name='stream_offset' type-id='type-id-40' filepath='src/third_party/boost-1.60.0/boost/iostreams/positioning.hpp' line='36' column='1' id='type-id-275'/>
+        <typedef-decl name='stream_offset' type-id='type-id-42' filepath='src/third_party/boost-1.60.0/boost/iostreams/positioning.hpp' line='36' column='1' id='type-id-277'/>
         <namespace-decl name='detail'>
-          <class-decl name='path' size-in-bits='576' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='37' column='1' id='type-id-95'>
+          <class-decl name='path' size-in-bits='576' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='37' column='1' id='type-id-97'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='narrow_' type-id='type-id-194' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='155' column='1'/>
+              <var-decl name='narrow_' type-id='type-id-196' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='155' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='256'>
-              <var-decl name='wide_' type-id='type-id-197' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='156' column='1'/>
+              <var-decl name='wide_' type-id='type-id-199' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='156' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='512'>
               <var-decl name='is_wide_' type-id='type-id-1' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='157' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='path' mangled-name='_ZN5boost9iostreams6detail4pathC2Ev' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='path' mangled-name='_ZN5boost9iostreams6detail4pathC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <parameter type-id='type-id-196'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <parameter type-id='type-id-198'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='path' mangled-name='_ZN5boost9iostreams6detail4pathC2EPKc' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <parameter type-id='type-id-29'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <parameter type-id='type-id-31'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='path' mangled-name='_ZN5boost9iostreams6detail4pathC2ERKS2_' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <parameter type-id='type-id-157'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <parameter type-id='type-id-159'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private' constructor='yes'>
               <function-decl name='path' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <parameter type-id='type-id-199'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <parameter type-id='type-id-201'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='c_str' mangled-name='_ZNK5boost9iostreams6detail4path5c_strEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-158' is-artificial='yes'/>
-                <return type-id='type-id-29'/>
+                <parameter type-id='type-id-160' is-artificial='yes'/>
+                <return type-id='type-id-31'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='operator=' mangled-name='_ZN5boost9iostreams6detail4pathaSERKS2_' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/path.hpp' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-97' is-artificial='yes'/>
-                <parameter type-id='type-id-157'/>
-                <return type-id='type-id-96'/>
+                <parameter type-id='type-id-99' is-artificial='yes'/>
+                <parameter type-id='type-id-159'/>
+                <return type-id='type-id-98'/>
               </function-decl>
             </member-function>
           </class-decl>
-          <class-decl name='file_descriptor_impl' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='50' column='1' id='type-id-85'>
+          <class-decl name='file_descriptor_impl' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='50' column='1' id='type-id-87'>
             <member-type access='public'>
-              <enum-decl name='flags' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='52' column='1' id='type-id-277'>
-                <underlying-type type-id='type-id-48'/>
+              <enum-decl name='flags' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='52' column='1' id='type-id-279'>
+                <underlying-type type-id='type-id-50'/>
                 <enumerator name='never_close' value='0'/>
                 <enumerator name='close_on_exit' value='1'/>
                 <enumerator name='close_on_close' value='2'/>
@@ -2783,568 +2784,574 @@
               </enum-decl>
             </member-type>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='handle_' type-id='type-id-273' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='73' column='1'/>
+              <var-decl name='handle_' type-id='type-id-275' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='73' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='32'>
               <var-decl name='flags_' type-id='type-id-8' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='74' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='file_descriptor_impl' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_implC2Ev' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_implC2Ev'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes'>
               <function-decl name='~file_descriptor_impl' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_implD2Ev' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_implD2Ev'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='invalid_handle' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl14invalid_handleEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl14invalid_handleEv'>
-                <return type-id='type-id-273'/>
+                <return type-id='type-id-275'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='close_impl' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl10close_implEbb' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl10close_implEbb'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
                 <parameter type-id='type-id-1'/>
                 <parameter type-id='type-id-1'/>
-                <return type-id='type-id-249'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='close' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl5closeEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl5closeEv'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='open' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl4openEiNS2_5flagsE' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl4openEiNS2_5flagsE'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <parameter type-id='type-id-273'/>
-                <parameter type-id='type-id-277'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <parameter type-id='type-id-275'/>
+                <parameter type-id='type-id-279'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='open' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl4openERKNS1_4pathESt13_Ios_Openmode' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl4openERKNS1_4pathESt13_Ios_Openmode'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <parameter type-id='type-id-157'/>
-                <parameter type-id='type-id-251'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <parameter type-id='type-id-159'/>
+                <parameter type-id='type-id-253'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='is_open' mangled-name='_ZNK5boost9iostreams6detail20file_descriptor_impl7is_openEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams6detail20file_descriptor_impl7is_openEv'>
-                <parameter type-id='type-id-151' is-artificial='yes'/>
+                <parameter type-id='type-id-153' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='read' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl4readEPcl' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl4readEPcl'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <parameter type-id='type-id-120'/>
-                <parameter type-id='type-id-260'/>
-                <return type-id='type-id-260'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <parameter type-id='type-id-122'/>
+                <parameter type-id='type-id-262'/>
+                <return type-id='type-id-262'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='write' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl5writeEPKcl' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl5writeEPKcl'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <parameter type-id='type-id-29'/>
-                <parameter type-id='type-id-260'/>
-                <return type-id='type-id-260'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <parameter type-id='type-id-31'/>
+                <parameter type-id='type-id-262'/>
+                <return type-id='type-id-262'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='seek' mangled-name='_ZN5boost9iostreams6detail20file_descriptor_impl4seekElSt12_Ios_Seekdir' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/file_descriptor.cpp' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail20file_descriptor_impl4seekElSt12_Ios_Seekdir'>
-                <parameter type-id='type-id-87' is-artificial='yes'/>
-                <parameter type-id='type-id-275'/>
-                <parameter type-id='type-id-253'/>
-                <return type-id='type-id-259'/>
+                <parameter type-id='type-id-89' is-artificial='yes'/>
+                <parameter type-id='type-id-277'/>
+                <parameter type-id='type-id-255'/>
+                <return type-id='type-id-261'/>
               </function-decl>
             </member-function>
           </class-decl>
-          <typedef-decl name='file_handle' type-id='type-id-8' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/file_handle.hpp' line='27' column='1' id='type-id-273'/>
+          <typedef-decl name='file_handle' type-id='type-id-8' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/file_handle.hpp' line='27' column='1' id='type-id-275'/>
           <function-decl name='system_failure' mangled-name='_ZN5boost9iostreams6detail14system_failureB5cxx11EPKc' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/system_failure.hpp' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail14system_failureB5cxx11EPKc'>
-            <parameter type-id='type-id-29' name='msg' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/system_failure.hpp' line='39' column='1'/>
-            <return type-id='type-id-210'/>
+            <parameter type-id='type-id-31' name='msg' filepath='src/third_party/boost-1.60.0/boost/iostreams/detail/system_failure.hpp' line='39' column='1'/>
+            <return type-id='type-id-212'/>
           </function-decl>
         </namespace-decl>
       </namespace-decl>
       <function-decl name='throw_exception&lt;std::ios_base::failure&gt;' mangled-name='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15throw_exceptionINSt8ios_base7failureB5cxx11EEEvRKT_'>
-        <parameter type-id='type-id-212' name='e' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1'/>
-        <return type-id='type-id-249'/>
+        <parameter type-id='type-id-214' name='e' filepath='src/third_party/boost-1.60.0/boost/throw_exception.hpp' line='62' column='1'/>
+        <return type-id='type-id-251'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='shared_ptr&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-114'>
+      <class-decl name='shared_ptr&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='336' column='1' id='type-id-116'>
         <member-type access='private'>
-          <typedef-decl name='element_type' type-id='type-id-278' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-118'/>
+          <typedef-decl name='element_type' type-id='type-id-280' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-120'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='px' type-id='type-id-119' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='768' column='1'/>
+          <var-decl name='px' type-id='type-id-121' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='768' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='pn' type-id='type-id-56' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='769' column='1'/>
+          <var-decl name='pn' type-id='type-id-58' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='769' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-180'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <parameter type-id='type-id-182'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='608' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-116'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <parameter type-id='type-id-118'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='shared_ptr&lt;boost::iostreams::detail::mapped_file_impl&gt;' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEEC2IS3_EEPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-90'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEEptEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='691' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-181' is-artificial='yes'/>
-            <return type-id='type-id-279'/>
+            <parameter type-id='type-id-183' is-artificial='yes'/>
+            <return type-id='type-id-281'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEE4swapERS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-115'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <parameter type-id='type-id-117'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reset&lt;boost::iostreams::detail::mapped_file_impl&gt;' mangled-name='_ZN5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEE5resetIS3_EEvPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10shared_ptrINS_9iostreams6detail16mapped_file_implEE5resetIS3_EEvPT_'>
-            <parameter type-id='type-id-117' is-artificial='yes'/>
-            <parameter type-id='type-id-90'/>
-            <return type-id='type-id-249'/>
+            <parameter type-id='type-id-119' is-artificial='yes'/>
+            <parameter type-id='type-id-92'/>
+            <return type-id='type-id-251'/>
           </function-decl>
         </member-function>
       </class-decl>
       <namespace-decl name='core'>
-        <typedef-decl name='typeinfo' type-id='type-id-261' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-280'/>
+        <typedef-decl name='typeinfo' type-id='type-id-263' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-282'/>
       </namespace-decl>
       <namespace-decl name='detail'>
-        <class-decl name='shared_count' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='107' column='1' id='type-id-56'>
+        <class-decl name='shared_count' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='107' column='1' id='type-id-58'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='pi_' type-id='type-id-62' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='111' column='1'/>
+            <var-decl name='pi_' type-id='type-id-64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='111' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='shared_count' mangled-name='_ZN5boost6detail12shared_countC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~shared_count' mangled-name='_ZN5boost6detail12shared_countD2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='shared_count' mangled-name='_ZN5boost6detail12shared_countC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-126'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-128'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='shared_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='489' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-58'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-60'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='shared_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-134'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-136'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='shared_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='500' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-134'/>
-              <parameter type-id='type-id-281'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-136'/>
+              <parameter type-id='type-id-283'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='shared_count&lt;boost::iostreams::detail::file_descriptor_impl&gt;' mangled-name='_ZN5boost6detail12shared_countC2INS_9iostreams6detail20file_descriptor_implEEEPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/move.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-87'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-89'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='shared_count&lt;boost::iostreams::detail::mapped_file_impl&gt;' mangled-name='_ZN5boost6detail12shared_countC2INS_9iostreams6detail16mapped_file_implEEEPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-90'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-92'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='swap' mangled-name='_ZN5boost6detail12shared_count4swapERS1_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-59' is-artificial='yes'/>
-              <parameter type-id='type-id-57'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-61' is-artificial='yes'/>
+              <parameter type-id='type-id-59'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='sp_counted_base' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='61' column='1' id='type-id-60'>
+        <class-decl name='sp_counted_base' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='61' column='1' id='type-id-62'>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='use_count_' type-id='type-id-282' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='68' column='1'/>
+            <var-decl name='use_count_' type-id='type-id-284' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='68' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='96'>
-            <var-decl name='weak_count_' type-id='type-id-282' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='69' column='1'/>
+            <var-decl name='weak_count_' type-id='type-id-284' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='69' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='sp_counted_base' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <parameter type-id='type-id-129'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <parameter type-id='type-id-131'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='sp_counted_base' mangled-name='_ZN5boost6detail15sp_counted_baseC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='release' mangled-name='_ZN5boost6detail15sp_counted_base7releaseEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='weak_release' mangled-name='_ZN5boost6detail15sp_counted_base12weak_releaseEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='add_ref_copy' mangled-name='_ZN5boost6detail15sp_counted_base12add_ref_copyEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~sp_counted_base' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='dispose' mangled-name='_ZN5boost6detail15sp_counted_base7disposeEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='3'>
             <function-decl name='destroy' mangled-name='_ZN5boost6detail15sp_counted_base7destroyEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='get_deleter' mangled-name='_ZN5boost6detail15sp_counted_base11get_deleterERKSt9type_info' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <parameter type-id='type-id-245'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <parameter type-id='type-id-247'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='get_untyped_deleter' mangled-name='_ZN5boost6detail15sp_counted_base19get_untyped_deleterEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-62' is-artificial='yes'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-64' is-artificial='yes'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='sp_counted_impl_p&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='53' column='1' id='type-id-283'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-60'/>
+        <class-decl name='sp_counted_impl_p&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='53' column='1' id='type-id-285'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-62'/>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='px_' type-id='type-id-90' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='57' column='1'/>
+            <var-decl name='px_' type-id='type-id-92' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='57' column='1'/>
           </data-member>
           <member-function access='private'>
             <function-decl name='sp_counted_impl_p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-284' is-artificial='yes'/>
-              <parameter type-id='type-id-285'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-286' is-artificial='yes'/>
+              <parameter type-id='type-id-287'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='sp_counted_impl_p' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail16mapped_file_implEEC2EPS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-284' is-artificial='yes'/>
-              <parameter type-id='type-id-90'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-286' is-artificial='yes'/>
+              <parameter type-id='type-id-92'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='dispose' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail16mapped_file_implEE7disposeEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-284' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-286' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='get_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail16mapped_file_implEE11get_deleterERKSt9type_info' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-284' is-artificial='yes'/>
-              <parameter type-id='type-id-245'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-286' is-artificial='yes'/>
+              <parameter type-id='type-id-247'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='get_untyped_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_9iostreams6detail16mapped_file_implEE19get_untyped_deleterEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-284' is-artificial='yes'/>
-              <return type-id='type-id-20'/>
+              <parameter type-id='type-id-286' is-artificial='yes'/>
+              <return type-id='type-id-22'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='weak_count' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='560' column='1' id='type-id-66'>
+        <class-decl name='weak_count' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='560' column='1' id='type-id-68'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='pi_' type-id='type-id-62' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='564' column='1'/>
+            <var-decl name='pi_' type-id='type-id-64' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='564' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='weak_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-69' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-71' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='weak_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='581' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-69' is-artificial='yes'/>
-              <parameter type-id='type-id-126'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-71' is-artificial='yes'/>
+              <parameter type-id='type-id-128'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='weak_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-69' is-artificial='yes'/>
-              <parameter type-id='type-id-134'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-71' is-artificial='yes'/>
+              <parameter type-id='type-id-136'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='weak_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-69' is-artificial='yes'/>
-              <parameter type-id='type-id-68'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-71' is-artificial='yes'/>
+              <parameter type-id='type-id-70'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~weak_count' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-69' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-71' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='sp_array_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-286'>
+        <class-decl name='sp_array_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='175' column='1' id='type-id-288'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-249' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-287'/>
+            <typedef-decl name='type' type-id='type-id-251' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='177' column='1' id='type-id-289'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_dereference&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-288'>
+        <class-decl name='sp_dereference&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='101' column='1' id='type-id-290'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-89' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-289'/>
+            <typedef-decl name='type' type-id='type-id-91' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='103' column='1' id='type-id-291'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_element&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-290'>
+        <class-decl name='sp_element&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='76' column='1' id='type-id-292'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-88' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-278'/>
+            <typedef-decl name='type' type-id='type-id-90' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='78' column='1' id='type-id-280'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_member_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-291'>
+        <class-decl name='sp_member_access&lt;boost::iostreams::detail::mapped_file_impl&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='150' column='1' id='type-id-293'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-90' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-279'/>
+            <typedef-decl name='type' type-id='type-id-92' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='152' column='1' id='type-id-281'/>
           </member-type>
         </class-decl>
-        <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='71' column='1' id='type-id-281'/>
-        <typedef-decl name='atomic_int_least32_t' type-id='type-id-39' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='27' column='1' id='type-id-282'/>
-        <typedef-decl name='sp_typeinfo' type-id='type-id-280' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-243'/>
+        <class-decl name='sp_nothrow_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='71' column='1' id='type-id-283'/>
+        <typedef-decl name='atomic_int_least32_t' type-id='type-id-41' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='27' column='1' id='type-id-284'/>
+        <typedef-decl name='sp_typeinfo' type-id='type-id-282' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-245'/>
         <function-decl name='sp_pointer_construct&lt;boost::iostreams::detail::mapped_file_impl, boost::iostreams::detail::mapped_file_impl&gt;' mangled-name='_ZN5boost6detail20sp_pointer_constructINS_9iostreams6detail16mapped_file_implES4_EEvPNS_10shared_ptrIT_EEPT0_RNS0_12shared_countE' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail20sp_pointer_constructINS_9iostreams6detail16mapped_file_implES4_EEvPNS_10shared_ptrIT_EEPT0_RNS0_12shared_countE'>
-          <parameter type-id='type-id-117' name='ppx' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <parameter type-id='type-id-90' name='p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <parameter type-id='type-id-57' name='pn' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
-          <return type-id='type-id-249'/>
+          <parameter type-id='type-id-119' name='ppx' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <parameter type-id='type-id-92' name='p' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <parameter type-id='type-id-59' name='pn' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='282' column='1'/>
+          <return type-id='type-id-251'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='iostreams'>
-        <class-decl name='mapped_file' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='223' column='1' id='type-id-292'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-293'/>
+        <class-decl name='mapped_file' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='223' column='1' id='type-id-294'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-295'/>
+          <member-type access='private'>
+            <typedef-decl name='const_iterator' type-id='type-id-31' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='239' column='1' id='type-id-296'/>
+          </member-type>
           <member-type access='private'>
-            <typedef-decl name='const_iterator' type-id='type-id-29' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='239' column='1' id='type-id-294'/>
+            <typedef-decl name='delegate_type' type-id='type-id-108' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='225' column='1' id='type-id-297'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='delegate_type' type-id='type-id-106' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='225' column='1' id='type-id-295'/>
+            <typedef-decl name='iterator' type-id='type-id-122' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='238' column='1' id='type-id-298'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='iterator' type-id='type-id-120' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='238' column='1' id='type-id-296'/>
+            <typedef-decl name='safe_bool' type-id='type-id-300' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='226' column='1' id='type-id-299'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='max_length' type-id='type-id-155' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='240' column='1'/>
+            <var-decl name='max_length' type-id='type-id-157' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='240' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='delegate_' type-id='type-id-295' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='321' column='1'/>
+            <var-decl name='delegate_' type-id='type-id-297' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='321' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-297' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-301' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file' mangled-name='_ZN5boost9iostreams11mapped_fileC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams11mapped_fileC2ERKS1_'>
-              <parameter type-id='type-id-297' is-artificial='yes'/>
-              <parameter type-id='type-id-298'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-301' is-artificial='yes'/>
+              <parameter type-id='type-id-302'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='resize' mangled-name='_ZN5boost9iostreams11mapped_file6resizeEl' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams11mapped_file6resizeEl'>
-              <parameter type-id='type-id-297' is-artificial='yes'/>
-              <parameter type-id='type-id-275'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-301' is-artificial='yes'/>
+              <parameter type-id='type-id-277'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='mapped_file_base' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='47' column='1' id='type-id-293'>
+        <class-decl name='mapped_file_base' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='47' column='1' id='type-id-295'>
           <member-type access='private'>
-            <enum-decl name='mapmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='49' column='1' id='type-id-299'>
-              <underlying-type type-id='type-id-48'/>
+            <enum-decl name='mapmode' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='49' column='1' id='type-id-303'>
+              <underlying-type type-id='type-id-50'/>
               <enumerator name='readonly' value='1'/>
               <enumerator name='readwrite' value='2'/>
               <enumerator name='priv' value='4'/>
             </enum-decl>
           </member-type>
         </class-decl>
-        <class-decl name='mapped_file_sink' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='326' column='1' id='type-id-300'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-292'/>
+        <class-decl name='mapped_file_sink' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='326' column='1' id='type-id-304'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-294'/>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file_sink' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-301' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-305' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file_sink' mangled-name='_ZN5boost9iostreams16mapped_file_sinkC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='369' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams16mapped_file_sinkC2ERKS1_'>
-              <parameter type-id='type-id-301' is-artificial='yes'/>
-              <parameter type-id='type-id-302'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-305' is-artificial='yes'/>
+              <parameter type-id='type-id-306'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='mapped_file_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='149' column='1' id='type-id-106'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-293'/>
+        <class-decl name='mapped_file_source' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='149' column='1' id='type-id-108'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-295'/>
           <member-type access='private'>
-            <class-decl name='safe_bool_helper' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='151' column='1' id='type-id-303'>
+            <class-decl name='safe_bool_helper' size-in-bits='32' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='151' column='1' id='type-id-9'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <var-decl name='x' type-id='type-id-8' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='151' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='iterator' type-id='type-id-29' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='166' column='1' id='type-id-304'/>
+            <typedef-decl name='iterator' type-id='type-id-31' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='166' column='1' id='type-id-307'/>
+          </member-type>
+          <member-type access='private'>
+            <typedef-decl name='param_type' type-id='type-id-85' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='154' column='1' id='type-id-173'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='param_type' type-id='type-id-83' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='154' column='1' id='type-id-171'/>
+            <typedef-decl name='safe_bool' type-id='type-id-10' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='152' column='1' id='type-id-300'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='size_type' type-id='type-id-258' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='165' column='1' id='type-id-174'/>
+            <typedef-decl name='size_type' type-id='type-id-260' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='165' column='1' id='type-id-176'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='max_length' type-id='type-id-175' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='167' column='1'/>
+            <var-decl name='max_length' type-id='type-id-177' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='167' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='pimpl_' type-id='type-id-114' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='218' column='1'/>
+            <var-decl name='pimpl_' type-id='type-id-116' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='218' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file_source' mangled-name='_ZN5boost9iostreams18mapped_file_sourceC2Ev' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams18mapped_file_sourceC2Ev'>
-              <parameter type-id='type-id-107' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-109' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='mapped_file_source' mangled-name='_ZN5boost9iostreams18mapped_file_sourceC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams18mapped_file_sourceC2ERKS1_'>
-              <parameter type-id='type-id-107' is-artificial='yes'/>
-              <parameter type-id='type-id-169'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-109' is-artificial='yes'/>
+              <parameter type-id='type-id-171'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_open' mangled-name='_ZNK5boost9iostreams18mapped_file_source7is_openEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source7is_openEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='close' mangled-name='_ZN5boost9iostreams18mapped_file_source5closeEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams18mapped_file_source5closeEv'>
-              <parameter type-id='type-id-107' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-109' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator int boost::iostreams::mapped_file_source::safe_bool_helper::*' mangled-name='_ZNK5boost9iostreams18mapped_file_sourcecvMNS1_16safe_bool_helperEiEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_sourcecvMNS1_16safe_bool_helperEiEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-300'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator!' mangled-name='_ZNK5boost9iostreams18mapped_file_sourcentEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_sourcentEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='flags' mangled-name='_ZNK5boost9iostreams18mapped_file_source5flagsEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source5flagsEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-299'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-303'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='size' mangled-name='_ZNK5boost9iostreams18mapped_file_source4sizeEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source4sizeEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-174'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-176'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='data' mangled-name='_ZNK5boost9iostreams18mapped_file_source4dataEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source4dataEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-29'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-31'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='begin' mangled-name='_ZNK5boost9iostreams18mapped_file_source5beginEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source5beginEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-304'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-307'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='end' mangled-name='_ZNK5boost9iostreams18mapped_file_source3endEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost9iostreams18mapped_file_source3endEv'>
-              <parameter type-id='type-id-170' is-artificial='yes'/>
-              <return type-id='type-id-304'/>
+              <parameter type-id='type-id-172' is-artificial='yes'/>
+              <return type-id='type-id-307'/>
             </function-decl>
           </member-function>
           <member-function access='public' static='yes'>
@@ -3354,156 +3361,156 @@
           </member-function>
           <member-function access='private'>
             <function-decl name='init' mangled-name='_ZN5boost9iostreams18mapped_file_source4initEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams18mapped_file_source4initEv'>
-              <parameter type-id='type-id-107' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-109' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='open_impl' mangled-name='_ZN5boost9iostreams18mapped_file_source9open_implERKNS0_24basic_mapped_file_paramsINS0_6detail4pathEEE' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams18mapped_file_source9open_implERKNS0_24basic_mapped_file_paramsINS0_6detail4pathEEE'>
-              <parameter type-id='type-id-107' is-artificial='yes'/>
-              <parameter type-id='type-id-173'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-109' is-artificial='yes'/>
+              <parameter type-id='type-id-175'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='basic_mapped_file_params&lt;boost::iostreams::detail::path&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='109' column='1' id='type-id-83'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-93'/>
+        <class-decl name='basic_mapped_file_params&lt;boost::iostreams::detail::path&gt;' size-in-bits='896' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='109' column='1' id='type-id-85'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-95'/>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='path' type-id='type-id-95' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='142' column='1'/>
+            <var-decl name='path' type-id='type-id-97' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='142' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='basic_mapped_file_params' mangled-name='_ZN5boost9iostreams24basic_mapped_file_paramsINS0_6detail4pathEEC2Ev' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-84' is-artificial='yes'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-86' is-artificial='yes'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_mapped_file_params' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-84' is-artificial='yes'/>
-              <parameter type-id='type-id-157'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-86' is-artificial='yes'/>
+              <parameter type-id='type-id-159'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='basic_mapped_file_params' mangled-name='_ZN5boost9iostreams24basic_mapped_file_paramsINS0_6detail4pathEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-84' is-artificial='yes'/>
-              <parameter type-id='type-id-149'/>
-              <return type-id='type-id-249'/>
+              <parameter type-id='type-id-86' is-artificial='yes'/>
+              <parameter type-id='type-id-151'/>
+              <return type-id='type-id-251'/>
             </function-decl>
           </member-function>
         </class-decl>
         <namespace-decl name='detail'>
-          <class-decl name='mapped_file_impl' size-in-bits='1088' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='45' column='1' id='type-id-88'>
+          <class-decl name='mapped_file_impl' size-in-bits='1088' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='45' column='1' id='type-id-90'>
             <member-type access='private'>
-              <typedef-decl name='mapmode' type-id='type-id-299' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='49' column='1' id='type-id-305'/>
+              <typedef-decl name='mapmode' type-id='type-id-303' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='49' column='1' id='type-id-308'/>
             </member-type>
             <member-type access='private'>
-              <typedef-decl name='param_type' type-id='type-id-171' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='48' column='1' id='type-id-91'/>
+              <typedef-decl name='param_type' type-id='type-id-173' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='48' column='1' id='type-id-93'/>
             </member-type>
             <member-type access='private'>
-              <typedef-decl name='size_type' type-id='type-id-174' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='47' column='1' id='type-id-154'/>
+              <typedef-decl name='size_type' type-id='type-id-176' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='47' column='1' id='type-id-156'/>
             </member-type>
             <data-member access='public' static='yes'>
-              <var-decl name='max_length' type-id='type-id-155' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='50' column='1'/>
+              <var-decl name='max_length' type-id='type-id-157' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='50' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='params_' type-id='type-id-91' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='70' column='1'/>
+              <var-decl name='params_' type-id='type-id-93' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='70' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='896'>
-              <var-decl name='data_' type-id='type-id-120' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='71' column='1'/>
+              <var-decl name='data_' type-id='type-id-122' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='71' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='960'>
-              <var-decl name='size_' type-id='type-id-275' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='72' column='1'/>
+              <var-decl name='size_' type-id='type-id-277' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='72' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='1024'>
-              <var-decl name='handle_' type-id='type-id-273' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='73' column='1'/>
+              <var-decl name='handle_' type-id='type-id-275' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='73' column='1'/>
             </data-member>
             <data-member access='private' layout-offset-in-bits='1056'>
               <var-decl name='error_' type-id='type-id-1' visibility='default' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='77' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='mapped_file_impl' mangled-name='_ZN5boost9iostreams6detail16mapped_file_implC2Ev' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='52' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_implC2Ev'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes'>
               <function-decl name='~mapped_file_impl' mangled-name='_ZN5boost9iostreams6detail16mapped_file_implD2Ev' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_implD2Ev'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='clear' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl5clearEb' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl5clearEb'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
                 <parameter type-id='type-id-1'/>
-                <return type-id='type-id-249'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='unmap_file' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl10unmap_fileEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='67' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl10unmap_fileEv'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='close' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl5closeEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl5closeEv'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='is_open' mangled-name='_ZNK5boost9iostreams6detail16mapped_file_impl7is_openEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-153' is-artificial='yes'/>
+                <parameter type-id='type-id-155' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='open' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl4openENS0_24basic_mapped_file_paramsINS1_4pathEEE' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl4openENS0_24basic_mapped_file_paramsINS1_4pathEEE'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-91'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-93'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='open_file' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl9open_fileENS0_24basic_mapped_file_paramsINS1_4pathEEE' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl9open_fileENS0_24basic_mapped_file_paramsINS1_4pathEEE'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-91'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-93'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='try_map_file' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl12try_map_fileENS0_24basic_mapped_file_paramsINS1_4pathEEE' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl12try_map_fileENS0_24basic_mapped_file_paramsINS1_4pathEEE'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-91'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-93'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='map_file' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl8map_fileERNS0_24basic_mapped_file_paramsINS1_4pathEEE' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl8map_fileERNS0_24basic_mapped_file_paramsINS1_4pathEEE'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-92'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-94'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='cleanup_and_throw' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl17cleanup_and_throwEPKc' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl17cleanup_and_throwEPKc'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-29'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-31'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='flags' mangled-name='_ZNK5boost9iostreams6detail16mapped_file_impl5flagsEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='58' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-153' is-artificial='yes'/>
-                <return type-id='type-id-305'/>
+                <parameter type-id='type-id-155' is-artificial='yes'/>
+                <return type-id='type-id-308'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='resize' mangled-name='_ZN5boost9iostreams6detail16mapped_file_impl6resizeEl' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail16mapped_file_impl6resizeEl'>
-                <parameter type-id='type-id-90' is-artificial='yes'/>
-                <parameter type-id='type-id-275'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-92' is-artificial='yes'/>
+                <parameter type-id='type-id-277'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
@@ -3513,82 +3520,82 @@
             </member-function>
             <member-function access='public'>
               <function-decl name='error' mangled-name='_ZNK5boost9iostreams6detail16mapped_file_impl5errorEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-153' is-artificial='yes'/>
+                <parameter type-id='type-id-155' is-artificial='yes'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='size' mangled-name='_ZNK5boost9iostreams6detail16mapped_file_impl4sizeEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-153' is-artificial='yes'/>
-                <return type-id='type-id-258'/>
+                <parameter type-id='type-id-155' is-artificial='yes'/>
+                <return type-id='type-id-260'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZNK5boost9iostreams6detail16mapped_file_impl4dataEv' filepath='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-153' is-artificial='yes'/>
-                <return type-id='type-id-120'/>
+                <parameter type-id='type-id-155' is-artificial='yes'/>
+                <return type-id='type-id-122'/>
               </function-decl>
             </member-function>
           </class-decl>
-          <class-decl name='mapped_file_params_base' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='82' column='1' id='type-id-93'>
+          <class-decl name='mapped_file_params_base' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='82' column='1' id='type-id-95'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='flags' type-id='type-id-299' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='92' column='1'/>
+              <var-decl name='flags' type-id='type-id-303' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='92' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='32'>
-              <var-decl name='mode' type-id='type-id-251' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='93' column='1'/>
+              <var-decl name='mode' type-id='type-id-253' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='93' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='offset' type-id='type-id-275' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='94' column='1'/>
+              <var-decl name='offset' type-id='type-id-277' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='94' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='length' type-id='type-id-258' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='95' column='1'/>
+              <var-decl name='length' type-id='type-id-260' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='95' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='192'>
-              <var-decl name='new_file_size' type-id='type-id-275' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='96' column='1'/>
+              <var-decl name='new_file_size' type-id='type-id-277' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='96' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='256'>
-              <var-decl name='hint' type-id='type-id-29' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='97' column='1'/>
+              <var-decl name='hint' type-id='type-id-31' visibility='default' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='97' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='mapped_file_params_base' mangled-name='_ZN5boost9iostreams6detail23mapped_file_params_baseC2Ev' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-94' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-96' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='normalize' mangled-name='_ZN5boost9iostreams6detail23mapped_file_params_base9normalizeEv' filepath='src/third_party/boost-1.60.0/boost/iostreams/device/mapped_file.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost9iostreams6detail23mapped_file_params_base9normalizeEv'>
-                <parameter type-id='type-id-94' is-artificial='yes'/>
-                <return type-id='type-id-249'/>
+                <parameter type-id='type-id-96' is-artificial='yes'/>
+                <return type-id='type-id-251'/>
               </function-decl>
             </member-function>
           </class-decl>
         </namespace-decl>
       </namespace-decl>
     </namespace-decl>
-    <type-decl name='variadic parameter type' id='type-id-306'/>
-    <type-decl name='void' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-249' id='type-id-20'/>
-    <function-type size-in-bits='64' id='type-id-226'>
-      <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-20'/>
+    <type-decl name='variadic parameter type' id='type-id-309'/>
+    <type-decl name='void' id='type-id-251'/>
+    <pointer-type-def type-id='type-id-251' id='type-id-22'/>
+    <function-type size-in-bits='64' id='type-id-228'>
+      <parameter type-id='type-id-22'/>
+      <parameter type-id='type-id-22'/>
       <return type-id='type-id-8'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-237'>
-      <return type-id='type-id-249'/>
+    <function-type size-in-bits='64' id='type-id-239'>
+      <return type-id='type-id-251'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='src/third_party/boost-1.60.0/libs/iostreams/src/mapped_file.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <reference-type-def kind='lvalue' type-id='type-id-283' size-in-bits='64' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-284'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-297'/>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
-    <reference-type-def kind='lvalue' type-id='type-id-106' size-in-bits='64' id='type-id-308'/>
-    <qualified-type-def type-id='type-id-283' const='yes' id='type-id-309'/>
-    <reference-type-def kind='lvalue' type-id='type-id-309' size-in-bits='64' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-310' size-in-bits='64' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
-    <qualified-type-def type-id='type-id-300' const='yes' id='type-id-312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-312' size-in-bits='64' id='type-id-302'/>
+    <reference-type-def kind='lvalue' type-id='type-id-285' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-285' size-in-bits='64' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
+    <reference-type-def kind='lvalue' type-id='type-id-108' size-in-bits='64' id='type-id-311'/>
+    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-312'/>
+    <reference-type-def kind='lvalue' type-id='type-id-312' size-in-bits='64' id='type-id-287'/>
+    <qualified-type-def type-id='type-id-294' const='yes' id='type-id-313'/>
+    <reference-type-def kind='lvalue' type-id='type-id-313' size-in-bits='64' id='type-id-302'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
+    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-315'/>
+    <reference-type-def kind='lvalue' type-id='type-id-315' size-in-bits='64' id='type-id-306'/>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/test-pointer-to-member-1.cc b/tests/data/test-read-dwarf/test-pointer-to-member-1.cc
new file mode 100644
index 00000000..c034e76c
--- /dev/null
+++ b/tests/data/test-read-dwarf/test-pointer-to-member-1.cc
@@ -0,0 +1,30 @@
+struct X {
+  void f(int);
+  int a;
+};
+struct Y;
+
+int X::* pmi = &X::a;
+void (X::* pmf)(int) = &X::f;
+double X::* pmd;
+char Y::* pmc;
+
+typedef struct { int t; } T;
+auto pmy = &T::t;
+
+namespace {
+struct Z { int z; };
+}
+int Z::* pmz = &Z::z;
+
+union U { int u; };
+auto pmu = &U::u;
+
+typedef const U CU;
+auto pmcu = &CU::u;
+
+int
+main()
+{
+  return 0;
+}
diff --git a/tests/data/test-read-dwarf/test-pointer-to-member-1.o b/tests/data/test-read-dwarf/test-pointer-to-member-1.o
new file mode 100644
index 0000000000000000000000000000000000000000..04c1b0458772f76c95a1cf226930efa31a806ed9
GIT binary patch
literal 4360
zcmbtXO>7%g5T56?osHLaoH$7vLKUZ?RZ8(+8q)tZ5VcJyRHbTATY=KGy><-okDPUB
zbD<YddqC<56$v4=C%7OXA?U3KE(n3dg)1rtkT@X(5=b1%%-c8X?ZYVuM%wpgzWIIs
z_8Z5ZKOPbSm;@Ywp2R4?7gmp7kn94C!6+;*-T2`y$*+7aQN4Mf(a#t>0>UJ_0cxhH
z2~r>tnCBrZgn0?|gH;eA>2?aGm+%V{9I0Xhh7HDm<YHzHWh)%1H(e0K6D+oe+KoC4
z#2P3J8rVpRzk}Uv`~sm8<nuOu=urhTPU@bAjQAx&VtdpKV^3xk7);!I$SipQ#E*#l
zh96prDE4GohM4sevb}&qVG&Oi&%sWd7sG}4xEw|59EkX23Nb+ne+XA05iKCl^B=CE
zIC2rEDP<ZPkV;8^5X-(>y4~0SF%l!gp5N#)x{MCIkKkAr#ORRp6W4t=thNhdQ8MUx
zjng>9Rt?=E(MjQ@CIMH#>p;8*VhXmUPo|&Sic>HLhIwFG9JKaZC(}nKLWmiOAhvHB
z9m5egnVy@#)g=ZX`UF_k5z9#8o*5Q9l4;ABnw%OIBLgYSZKj1`TGj!Jq6#!0%!#8D
zm`4K5<e`a5n&8+FMxk()3WvKXJ|;Y6!YdLWnZ|MsVeX-{;Gj*D{8Qsps0>O`hWCpb
zVuBPS!2$r%a*)c7MmV}fD{xE>*^e}i4oME|P0E%W;1GO}hPtqI1FM3k@C(Vwm4`uc
z)bND+fMQ<2J_05@iM<fw&t!r+Tva;e$V?FnAu$yi^1_k`5dnj~XiSPo>{LWt2!+t2
zylQu#((0Dh95``$IkUKXcX4l~Sj^4kikaEM?4H7W;pxoGS*Ma&vR$Rf&hE-&8*aDh
z9IiP{r&BMZXm`r1hp+6L&(6<fFVAMOHE7uNCg3sY!pg<d#q-7Lu{yZUx|?mc@H{)6
ztlP>qoJI+`Vy;|<{A#P=<SVVptMz=X?&jC(CA(Cw+4Z&jnX`Kev-5>Kxv%Fdwrfi^
z+i~nlw(`2&ss2yzN7eNx9h_KPJdl~esoV80W=*aJHlvCW8)rdWNr}n$fO!*_?s3HF
zBa&O-nPlp%&|)Hb91T3UZ%eBlhF>1^QyP6=06eK`<LN#IM$%~;0s`@jQUq%;a6|SZ
z!+R0_rZRB*_9Fvg{a~y!z6qY#1RvT2Pi=zZMWoR*%EN(q;EH!h+&@ad5qBZZd@$4=
zWzRZ}vsdAGok(K*pv1%e3^9IG;d-1!h3j#a5FZJwyMLWLYAe&rLhmZQl)VE>4<bEv
z?Z#F7y2N+AlZ`o;X#WkffIZhuD=L2%C>^gD;q>v!jwn50eyzyM7YcjE`D{F<>?v<=
zH9%gAq$2x4VieK*5fM%wzin?4h(vLMyXG^AdN|KHL0>DJ<M7V^E@01NA?SC_UWs5*
zLL}<&$?<6^fb$(e%4-3fPG^Qdq)!9*m<P%Bp2E3KTj{<E*z??y>RZkJWo3UqU>}_4
zsM1q><_Y4tBDbLZc2XjdJ+1FW5|HTmBVzoPCqhy6jDMnJIv+%O{ES4soWZ=1Tff?H
z?GpBG$Lm*_bDb+L<T}opoul^za;5ckmYq_!wo-3aTac?r-Y%6o&gF;HcE@hkoQGZ3
z>P?4TFb}f?uSmJvYBU`DEt_k$TqlRGMt0q`%de@x&gx3FV>cW%n*ZKSqASf&aBV2s
z0yRj%Ge)vnW@07n#FjAsx3veu8P#W0&mFHj%hSlvK3!ly^=)-A@O?#Rh1QGj3&v?*
z5T@sEBStjib$-kK49p{=kBM~b|Es3dM7jU^)qh<jy009le!2rVKiB^(VtP!3piF~B
zI;|-+5th+L$H?zvH6aBO0;JoXL0!N4SLr|@u|L&Mwd?iQ5z}KL1mCOtFOm=--L`_d
ze)(^y{Fjt3<tIqb-$jgKa-GOZnx&vfZLjlN&d>cd)b#Veqx`?|Jw1l~xWBoHe@9*T
z`G4?#SNUsZaGM_tO~H8?{z&<&?ZPm8p#1mwh{y2!G5jGi{pSA<HUGR%Y5r6Au|MNf
ykDePLxUcdrC?&mJ^ls|@^!Dm!7a_<fL;4#NBz^q!TcV$TN?lxcgU-n7{(k|I@m$3K

literal 0
HcmV?d00001

diff --git a/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
new file mode 100644
index 00000000..39980bcd
--- /dev/null
+++ b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
@@ -0,0 +1,59 @@
+<abi-corpus version='2.2'>
+  <elf-function-symbols>
+    <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+  </elf-function-symbols>
+  <elf-variable-symbols>
+    <elf-symbol name='pmc' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmcu' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmd' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmf' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmi' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmu' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+    <elf-symbol name='pmy' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
+  </elf-variable-symbols>
+  <abi-instr address-size='64' path='test-pointer-to-member-1.cc' comp-dir-path='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf' language='LANG_C_plus_plus_14'>
+    <type-decl name='char' size-in-bits='8' id='type-id-1'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-1' containing-type-id='type-id-2' id ='type-id-3'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-4'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-4' containing-type-id='type-id-5' id ='type-id-6'/>
+    <type-decl name='int' size-in-bits='32' id='type-id-7'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-8' id ='type-id-9'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-10' id ='type-id-11'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-7' containing-type-id='type-id-5' id ='type-id-12'/>
+    <class-decl name='T' size-in-bits='32' is-struct='yes' naming-typedef-id='type-id-8' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1' id='type-id-13'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='t' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1'/>
+      </data-member>
+    </class-decl>
+    <class-decl name='X' size-in-bits='32' is-struct='yes' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='1' column='1' id='type-id-5'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='a' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='3' column='1'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='T' type-id='type-id-13' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='12' column='1' id='type-id-8'/>
+    <union-decl name='U' size-in-bits='32' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='20' column='1' id='type-id-10'>
+      <data-member access='public'>
+        <var-decl name='u' type-id='type-id-7' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='20' column='1'/>
+      </data-member>
+    </union-decl>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-14' containing-type-id='type-id-5' id ='type-id-15'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-16'/>
+    <class-decl name='Y' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2'/>
+    <var-decl name='pmi' type-id='type-id-12' mangled-name='pmi' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='7' column='1' elf-symbol-id='pmi'/>
+    <type-decl name='void' id='type-id-17'/>
+    <var-decl name='pmf' type-id='type-id-15' mangled-name='pmf' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='8' column='1' elf-symbol-id='pmf'/>
+    <var-decl name='pmd' type-id='type-id-6' mangled-name='pmd' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='9' column='1' elf-symbol-id='pmd'/>
+    <var-decl name='pmc' type-id='type-id-3' mangled-name='pmc' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='10' column='1' elf-symbol-id='pmc'/>
+    <var-decl name='pmy' type-id='type-id-9' mangled-name='pmy' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='13' column='1' elf-symbol-id='pmy'/>
+    <var-decl name='pmu' type-id='type-id-11' mangled-name='pmu' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='21' column='1' elf-symbol-id='pmu'/>
+    <var-decl name='pmcu' type-id='type-id-11' mangled-name='pmcu' visibility='default' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='24' column='1' elf-symbol-id='pmcu'/>
+    <function-decl name='main' mangled-name='main' filepath='/home/dodji/git/libabigail/PR30260/tests/data/test-read-dwarf/test-pointer-to-member-1.cc' line='27' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='main'>
+      <return type-id='type-id-7'/>
+    </function-decl>
+    <function-type size-in-bits='64' method-class-id='type-id-5' id='type-id-14'>
+      <parameter type-id='type-id-16' is-artificial='yes'/>
+      <parameter type-id='type-id-7'/>
+      <return type-id='type-id-17'/>
+    </function-type>
+  </abi-instr>
+</abi-corpus>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index fb1f31e1..90914ded 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1785,16 +1785,18 @@
     <type-decl name='double' size-in-bits='64' id='type-id-38'/>
     <type-decl name='float' size-in-bits='32' id='type-id-39'/>
     <type-decl name='int' size-in-bits='32' id='type-id-40'/>
-    <type-decl name='long double' size-in-bits='128' id='type-id-41'/>
-    <type-decl name='long int' size-in-bits='64' id='type-id-42'/>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-43'/>
-    <type-decl name='short int' size-in-bits='16' id='type-id-44'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-40' containing-type-id='type-id-41' id ='type-id-42'/>
+    <type-decl name='long double' size-in-bits='128' id='type-id-43'/>
+    <type-decl name='long int' size-in-bits='64' id='type-id-44'/>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-45'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-46' containing-type-id='type-id-47' id ='type-id-48'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-49'/>
     <type-decl name='sizetype' size-in-bits='64' id='type-id-3'/>
-    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-45' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-46'>
+    <class-decl name='__mbstate_t' size-in-bits='64' is-struct='yes' naming-typedef-id='type-id-50' visibility='default' filepath='/usr/include/wchar.h' line='82' column='1' id='type-id-51'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-47'>
+        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1' id='type-id-52'>
           <data-member access='public'>
-            <var-decl name='__wch' type-id='type-id-48' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
+            <var-decl name='__wch' type-id='type-id-53' visibility='default' filepath='/usr/include/wchar.h' line='88' column='1'/>
           </data-member>
           <data-member access='public'>
             <var-decl name='__wchb' type-id='type-id-23' visibility='default' filepath='/usr/include/wchar.h' line='92' column='1'/>
@@ -1805,48 +1807,48 @@
         <var-decl name='__count' type-id='type-id-40' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-47' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
+        <var-decl name='__value' type-id='type-id-52' visibility='default' filepath='/usr/include/wchar.h' line='93' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='75' column='1' id='type-id-49'>
+    <class-decl name='__pthread_internal_list' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='75' column='1' id='type-id-54'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__prev' type-id='type-id-50' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='77' column='1'/>
+        <var-decl name='__prev' type-id='type-id-55' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='__next' type-id='type-id-50' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='78' column='1'/>
+        <var-decl name='__next' type-id='type-id-55' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-51'>
+    <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-48' visibility='default'/>
+        <var-decl name='gp_offset' type-id='type-id-53' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-48' visibility='default'/>
+        <var-decl name='fp_offset' type-id='type-id-53' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-52' visibility='default'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-57' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-52' visibility='default'/>
+        <var-decl name='reg_save_area' type-id='type-id-57' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-53' visibility='default' filepath='/usr/include/stdlib.h' line='105' column='1' id='type-id-54'>
+    <class-decl name='ldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-58' visibility='default' filepath='/usr/include/stdlib.h' line='105' column='1' id='type-id-59'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-42' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1'/>
+        <var-decl name='quot' type-id='type-id-44' visibility='default' filepath='/usr/include/stdlib.h' line='107' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-42' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
+        <var-decl name='rem' type-id='type-id-44' visibility='default' filepath='/usr/include/stdlib.h' line='108' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-55' visibility='default' filepath='/usr/include/stdlib.h' line='117' column='1' id='type-id-56'>
+    <class-decl name='lldiv_t' size-in-bits='128' is-struct='yes' naming-typedef-id='type-id-60' visibility='default' filepath='/usr/include/stdlib.h' line='117' column='1' id='type-id-61'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='quot' type-id='type-id-43' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1'/>
+        <var-decl name='quot' type-id='type-id-45' visibility='default' filepath='/usr/include/stdlib.h' line='119' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='rem' type-id='type-id-43' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
+        <var-decl name='rem' type-id='type-id-45' visibility='default' filepath='/usr/include/stdlib.h' line='120' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-57'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/include/time.h' line='133' column='1' id='type-id-62'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-40' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
@@ -1875,422 +1877,417 @@
         <var-decl name='tm_isdst' type-id='type-id-40' visibility='default' filepath='/usr/include/time.h' line='143' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='tm_gmtoff' type-id='type-id-42' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
+        <var-decl name='tm_gmtoff' type-id='type-id-44' visibility='default' filepath='/usr/include/time.h' line='146' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='tm_zone' type-id='type-id-58' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
+        <var-decl name='tm_zone' type-id='type-id-63' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_Atomic_word' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h' line='32' column='1' id='type-id-59'/>
-    <typedef-decl name='_G_fpos_t' type-id='type-id-54' filepath='/usr/include/_G_config.h' line='25' column='1' id='type-id-60'/>
-    <typedef-decl name='__bucket_type' type-id='type-id-61' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-62'/>
-    <typedef-decl name='__clock_t' type-id='type-id-42' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-63'/>
-    <typedef-decl name='__compar_fn_t' type-id='type-id-64' filepath='/usr/include/stdlib.h' line='741' column='1' id='type-id-65'/>
-    <typedef-decl name='__gthread_cond_t' type-id='type-id-66' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='52' column='1' id='type-id-67'/>
-    <typedef-decl name='__gthread_mutex_t' type-id='type-id-68' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='50' column='1' id='type-id-69'/>
-    <typedef-decl name='__gthread_t' type-id='type-id-70' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='47' column='1' id='type-id-71'/>
-    <typedef-decl name='__int32_t' type-id='type-id-40' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1' id='type-id-72'/>
-    <typedef-decl name='__mbstate_t' type-id='type-id-46' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-45'/>
-    <typedef-decl name='__node_base' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-74'/>
-    <typedef-decl name='__pthread_list_t' type-id='type-id-49' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='79' column='1' id='type-id-75'/>
-    <typedef-decl name='__time_t' type-id='type-id-42' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-76'/>
-    <typedef-decl name='__va_list_tag' type-id='type-id-51' id='type-id-77'/>
-    <typedef-decl name='clock_t' type-id='type-id-63' filepath='/usr/include/time.h' line='59' column='1' id='type-id-78'/>
-    <typedef-decl name='div_t' type-id='type-id-54' filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-79'/>
-    <typedef-decl name='fpos_t' type-id='type-id-60' filepath='/usr/include/stdio.h' line='110' column='1' id='type-id-80'/>
-    <typedef-decl name='int32_t' type-id='type-id-40' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-81'/>
-    <typedef-decl name='int64_t' type-id='type-id-42' filepath='/usr/include/stdint.h' line='40' column='1' id='type-id-82'/>
-    <typedef-decl name='intptr_t' type-id='type-id-42' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-83'/>
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-84' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='226' column='1' id='type-id-85'/>
-    <typedef-decl name='is_reference_tag' type-id='type-id-86' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='225' column='1' id='type-id-87'/>
-    <typedef-decl name='ldiv_t' type-id='type-id-54' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-53'/>
-    <typedef-decl name='lldiv_t' type-id='type-id-56' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-55'/>
-    <typedef-decl name='mbstate_t' type-id='type-id-45' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-88'/>
-    <typedef-decl name='pthread_cond_t' type-id='type-id-89' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='154' column='1' id='type-id-66'/>
-    <typedef-decl name='pthread_mutex_t' type-id='type-id-90' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='128' column='1' id='type-id-68'/>
-    <typedef-decl name='pthread_t' type-id='type-id-91' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='60' column='1' id='type-id-70'/>
-    <typedef-decl name='size_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-93'/>
-    <typedef-decl name='time_t' type-id='type-id-76' filepath='/usr/include/time.h' line='75' column='1' id='type-id-94'/>
-    <typedef-decl name='uint32_t' type-id='type-id-48' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-95'/>
-    <typedef-decl name='uint64_t' type-id='type-id-91' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-96'/>
-    <typedef-decl name='wctrans_t' type-id='type-id-97' filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-98'/>
-    <typedef-decl name='wctype_t' type-id='type-id-91' filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-99'/>
-    <typedef-decl name='wint_t' type-id='type-id-48' filepath='/usr/lib/llvm-3.6/bin/../lib/clang/3.6.0/include/stddef.h' line='132' column='1' id='type-id-100'/>
-    <union-decl name='pthread_cond_t' size-in-bits='384' naming-typedef-id='type-id-66' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='139' column='1' id='type-id-89'>
+    <typedef-decl name='_Atomic_word' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/atomic_word.h' line='32' column='1' id='type-id-64'/>
+    <typedef-decl name='_G_fpos_t' type-id='type-id-59' filepath='/usr/include/_G_config.h' line='25' column='1' id='type-id-65'/>
+    <typedef-decl name='__bucket_type' type-id='type-id-66' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-67'/>
+    <typedef-decl name='__clock_t' type-id='type-id-44' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-68'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-69' filepath='/usr/include/stdlib.h' line='741' column='1' id='type-id-70'/>
+    <typedef-decl name='__gthread_cond_t' type-id='type-id-71' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='52' column='1' id='type-id-72'/>
+    <typedef-decl name='__gthread_mutex_t' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='50' column='1' id='type-id-74'/>
+    <typedef-decl name='__gthread_t' type-id='type-id-75' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/gthr-default.h' line='47' column='1' id='type-id-76'/>
+    <typedef-decl name='__int32_t' type-id='type-id-40' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1' id='type-id-77'/>
+    <typedef-decl name='__mbstate_t' type-id='type-id-51' filepath='/usr/include/wchar.h' line='94' column='1' id='type-id-50'/>
+    <typedef-decl name='__node_base' type-id='type-id-78' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-79'/>
+    <typedef-decl name='__pthread_list_t' type-id='type-id-54' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='79' column='1' id='type-id-80'/>
+    <typedef-decl name='__time_t' type-id='type-id-44' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-81'/>
+    <typedef-decl name='__va_list_tag' type-id='type-id-56' id='type-id-82'/>
+    <typedef-decl name='clock_t' type-id='type-id-68' filepath='/usr/include/time.h' line='59' column='1' id='type-id-83'/>
+    <typedef-decl name='div_t' type-id='type-id-59' filepath='/usr/include/stdlib.h' line='101' column='1' id='type-id-84'/>
+    <typedef-decl name='fpos_t' type-id='type-id-65' filepath='/usr/include/stdio.h' line='110' column='1' id='type-id-85'/>
+    <typedef-decl name='int32_t' type-id='type-id-40' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-86'/>
+    <typedef-decl name='int64_t' type-id='type-id-44' filepath='/usr/include/stdint.h' line='40' column='1' id='type-id-87'/>
+    <typedef-decl name='intptr_t' type-id='type-id-44' filepath='/usr/include/stdint.h' line='119' column='1' id='type-id-88'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-89' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='226' column='1' id='type-id-90'/>
+    <typedef-decl name='is_reference_tag' type-id='type-id-91' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='225' column='1' id='type-id-92'/>
+    <typedef-decl name='ldiv_t' type-id='type-id-59' filepath='/usr/include/stdlib.h' line='109' column='1' id='type-id-58'/>
+    <typedef-decl name='lldiv_t' type-id='type-id-61' filepath='/usr/include/stdlib.h' line='121' column='1' id='type-id-60'/>
+    <typedef-decl name='mbstate_t' type-id='type-id-50' filepath='/usr/include/wchar.h' line='106' column='1' id='type-id-93'/>
+    <typedef-decl name='pthread_cond_t' type-id='type-id-94' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='154' column='1' id='type-id-71'/>
+    <typedef-decl name='pthread_mutex_t' type-id='type-id-95' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='128' column='1' id='type-id-73'/>
+    <typedef-decl name='pthread_t' type-id='type-id-96' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='60' column='1' id='type-id-75'/>
+    <typedef-decl name='size_type' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='61' column='1' id='type-id-98'/>
+    <typedef-decl name='time_t' type-id='type-id-81' filepath='/usr/include/time.h' line='75' column='1' id='type-id-99'/>
+    <typedef-decl name='uint32_t' type-id='type-id-53' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-100'/>
+    <typedef-decl name='uint64_t' type-id='type-id-96' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-101'/>
+    <typedef-decl name='wctrans_t' type-id='type-id-102' filepath='/usr/include/wctype.h' line='186' column='1' id='type-id-103'/>
+    <typedef-decl name='wctype_t' type-id='type-id-96' filepath='/usr/include/wctype.h' line='52' column='1' id='type-id-104'/>
+    <typedef-decl name='wint_t' type-id='type-id-53' filepath='/usr/lib/llvm-3.6/bin/../lib/clang/3.6.0/include/stddef.h' line='132' column='1' id='type-id-105'/>
+    <union-decl name='pthread_cond_t' size-in-bits='384' naming-typedef-id='type-id-71' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='139' column='1' id='type-id-94'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='141' column='1' id='type-id-101'>
+        <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='141' column='1' id='type-id-106'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-40' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='143' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='__futex' type-id='type-id-48' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='144' column='1'/>
+            <var-decl name='__futex' type-id='type-id-53' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='144' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='__total_seq' type-id='type-id-102' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='145' column='1'/>
+            <var-decl name='__total_seq' type-id='type-id-107' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='145' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='__wakeup_seq' type-id='type-id-102' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='146' column='1'/>
+            <var-decl name='__wakeup_seq' type-id='type-id-107' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='146' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='__woken_seq' type-id='type-id-102' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='147' column='1'/>
+            <var-decl name='__woken_seq' type-id='type-id-107' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='147' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='__mutex' type-id='type-id-52' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='148' column='1'/>
+            <var-decl name='__mutex' type-id='type-id-57' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='148' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='__nwaiters' type-id='type-id-48' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='149' column='1'/>
+            <var-decl name='__nwaiters' type-id='type-id-53' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='149' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='352'>
-            <var-decl name='__broadcast_seq' type-id='type-id-48' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='150' column='1'/>
+            <var-decl name='__broadcast_seq' type-id='type-id-53' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='150' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public'>
-        <var-decl name='__data' type-id='type-id-101' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='151' column='1'/>
+        <var-decl name='__data' type-id='type-id-106' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='151' column='1'/>
       </data-member>
       <data-member access='public'>
         <var-decl name='__size' type-id='type-id-21' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='152' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='__align' type-id='type-id-43' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='153' column='1'/>
+        <var-decl name='__align' type-id='type-id-45' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='153' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='pthread_mutex_t' size-in-bits='320' naming-typedef-id='type-id-68' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='90' column='1' id='type-id-90'>
+    <union-decl name='pthread_mutex_t' size-in-bits='320' naming-typedef-id='type-id-73' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='90' column='1' id='type-id-95'>
       <member-type access='public'>
-        <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='92' column='1' id='type-id-103'>
+        <class-decl name='__pthread_mutex_s' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='92' column='1' id='type-id-108'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='__lock' type-id='type-id-40' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='94' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='__count' type-id='type-id-48' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='95' column='1'/>
+            <var-decl name='__count' type-id='type-id-53' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='95' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <var-decl name='__owner' type-id='type-id-40' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='96' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
-            <var-decl name='__nusers' type-id='type-id-48' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='98' column='1'/>
+            <var-decl name='__nusers' type-id='type-id-53' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='98' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <var-decl name='__kind' type-id='type-id-40' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='102' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='160'>
-            <var-decl name='__spins' type-id='type-id-44' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='104' column='1'/>
+            <var-decl name='__spins' type-id='type-id-49' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='104' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='176'>
-            <var-decl name='__elision' type-id='type-id-44' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='105' column='1'/>
+            <var-decl name='__elision' type-id='type-id-49' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='105' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='__list' type-id='type-id-75' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='106' column='1'/>
+            <var-decl name='__list' type-id='type-id-80' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='106' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <data-member access='public'>
-        <var-decl name='__data' type-id='type-id-103' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='125' column='1'/>
+        <var-decl name='__data' type-id='type-id-108' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='125' column='1'/>
       </data-member>
       <data-member access='public'>
         <var-decl name='__size' type-id='type-id-19' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='126' column='1'/>
       </data-member>
       <data-member access='public'>
-        <var-decl name='__align' type-id='type-id-42' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='127' column='1'/>
+        <var-decl name='__align' type-id='type-id-44' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/pthreadtypes.h' line='127' column='1'/>
       </data-member>
     </union-decl>
-    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-104'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-105'/>
-    <array-type-def dimensions='1' type-id='type-id-105' size-in-bits='128' id='type-id-106'>
+    <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-109'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-110'/>
+    <array-type-def dimensions='1' type-id='type-id-110' size-in-bits='128' id='type-id-111'>
       <subrange length='16' lower-bound='0' upper-bound='15' type-id='type-id-3' id='type-id-12'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-105' size-in-bits='256' id='type-id-107'>
-      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-3' id='type-id-108'/>
+    <array-type-def dimensions='1' type-id='type-id-110' size-in-bits='256' id='type-id-112'>
+      <subrange length='32' lower-bound='0' upper-bound='31' type-id='type-id-3' id='type-id-113'/>
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-105' size-in-bits='768' id='type-id-109'>
-      <subrange length='96' lower-bound='0' upper-bound='95' type-id='type-id-3' id='type-id-110'/>
+    <array-type-def dimensions='1' type-id='type-id-110' size-in-bits='768' id='type-id-114'>
+      <subrange length='96' lower-bound='0' upper-bound='95' type-id='type-id-3' id='type-id-115'/>
     </array-type-def>
-    <type-decl name='unsigned int' size-in-bits='32' id='type-id-48'/>
-    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-91'/>
-    <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-102'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-111'/>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-112'/>
-    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-113'/>
-    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
-    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
-    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
-    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-125'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-127'/>
-    <pointer-type-def type-id='type-id-128' size-in-bits='64' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-133'/>
-    <pointer-type-def type-id='type-id-134' size-in-bits='64' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-139'/>
-    <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-61'/>
-    <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-50'/>
-    <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-142'/>
+    <type-decl name='unsigned int' size-in-bits='32' id='type-id-53'/>
+    <type-decl name='unsigned long int' size-in-bits='64' id='type-id-96'/>
+    <type-decl name='unsigned long long int' size-in-bits='64' id='type-id-107'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-116'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-117' containing-type-id='type-id-118' id ='type-id-119'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-120' containing-type-id='type-id-118' id ='type-id-121'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-122' containing-type-id='type-id-123' id ='type-id-124'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-125'/>
+    <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-126'/>
+    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-128'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-132'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-136'/>
+    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-138'/>
+    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-140'/>
+    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
     <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-144'/>
-    <reference-type-def kind='lvalue' type-id='type-id-144' size-in-bits='64' id='type-id-145'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-146'/>
-    <reference-type-def kind='lvalue' type-id='type-id-147' size-in-bits='64' id='type-id-148'/>
-    <reference-type-def kind='rvalue' type-id='type-id-147' size-in-bits='64' id='type-id-149'/>
-    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-150'/>
-    <reference-type-def kind='lvalue' type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
-    <reference-type-def kind='rvalue' type-id='type-id-151' size-in-bits='64' id='type-id-153'/>
-    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-154'/>
-    <reference-type-def kind='lvalue' type-id='type-id-155' size-in-bits='64' id='type-id-156'/>
-    <reference-type-def kind='rvalue' type-id='type-id-155' size-in-bits='64' id='type-id-157'/>
-    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-158'/>
-    <reference-type-def kind='lvalue' type-id='type-id-159' size-in-bits='64' id='type-id-160'/>
-    <reference-type-def kind='rvalue' type-id='type-id-159' size-in-bits='64' id='type-id-161'/>
-    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-162'/>
-    <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-166'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
-    <reference-type-def kind='rvalue' type-id='type-id-169' size-in-bits='64' id='type-id-170'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-171'/>
-    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
-    <reference-type-def kind='rvalue' type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-176'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-178'/>
-    <reference-type-def kind='rvalue' type-id='type-id-179' size-in-bits='64' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
-    <reference-type-def kind='rvalue' type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
-    <reference-type-def kind='rvalue' type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
-    <reference-type-def kind='rvalue' type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
-    <reference-type-def kind='rvalue' type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-192'/>
-    <qualified-type-def type-id='type-id-192' restrict='yes' id='type-id-193'/>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-150'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-66'/>
+    <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-55'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-157'/>
+    <reference-type-def kind='lvalue' type-id='type-id-157' size-in-bits='64' id='type-id-158'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1' size-in-bits='64' id='type-id-159'/>
+    <reference-type-def kind='lvalue' type-id='type-id-160' size-in-bits='64' id='type-id-161'/>
+    <reference-type-def kind='rvalue' type-id='type-id-160' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-163'/>
+    <reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
+    <reference-type-def kind='rvalue' type-id='type-id-164' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-167'/>
+    <reference-type-def kind='lvalue' type-id='type-id-168' size-in-bits='64' id='type-id-169'/>
+    <reference-type-def kind='rvalue' type-id='type-id-168' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-171'/>
+    <reference-type-def kind='lvalue' type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
+    <reference-type-def kind='rvalue' type-id='type-id-172' size-in-bits='64' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
+    <reference-type-def kind='rvalue' type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-184'/>
+    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-186'/>
+    <reference-type-def kind='rvalue' type-id='type-id-187' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
+    <reference-type-def kind='rvalue' type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
     <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-194'/>
-    <qualified-type-def type-id='type-id-194' restrict='yes' id='type-id-195'/>
-    <qualified-type-def type-id='type-id-114' const='yes' id='type-id-196'/>
-    <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-197'/>
-    <qualified-type-def type-id='type-id-116' const='yes' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-199'/>
-    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-201'/>
-    <qualified-type-def type-id='type-id-120' const='yes' id='type-id-202'/>
-    <reference-type-def kind='lvalue' type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-204'/>
-    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-205' size-in-bits='64' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-196'/>
+    <reference-type-def kind='rvalue' type-id='type-id-197' size-in-bits='64' id='type-id-198'/>
+    <reference-type-def kind='rvalue' type-id='type-id-199' size-in-bits='64' id='type-id-200'/>
+    <reference-type-def kind='rvalue' type-id='type-id-201' size-in-bits='64' id='type-id-202'/>
+    <reference-type-def kind='rvalue' type-id='type-id-203' size-in-bits='64' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-205'/>
+    <qualified-type-def type-id='type-id-205' restrict='yes' id='type-id-206'/>
     <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-207'/>
-    <qualified-type-def type-id='type-id-124' const='yes' id='type-id-208'/>
-    <reference-type-def kind='lvalue' type-id='type-id-208' size-in-bits='64' id='type-id-209'/>
-    <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-210'/>
-    <qualified-type-def type-id='type-id-126' const='yes' id='type-id-211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-211' size-in-bits='64' id='type-id-212'/>
-    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-213'/>
-    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-216'/>
-    <qualified-type-def type-id='type-id-130' const='yes' id='type-id-217'/>
-    <reference-type-def kind='lvalue' type-id='type-id-217' size-in-bits='64' id='type-id-218'/>
-    <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-219'/>
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-220'/>
-    <reference-type-def kind='lvalue' type-id='type-id-220' size-in-bits='64' id='type-id-221'/>
-    <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-222'/>
-    <qualified-type-def type-id='type-id-134' const='yes' id='type-id-223'/>
-    <reference-type-def kind='lvalue' type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-225'/>
-    <qualified-type-def type-id='type-id-136' const='yes' id='type-id-226'/>
-    <reference-type-def kind='lvalue' type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
-    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-228'/>
-    <qualified-type-def type-id='type-id-138' const='yes' id='type-id-229'/>
-    <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-230'/>
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-231'/>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-232'/>
-    <reference-type-def kind='lvalue' type-id='type-id-232' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-234'/>
-    <qualified-type-def type-id='type-id-72' const='yes' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-97'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-236'/>
+    <qualified-type-def type-id='type-id-207' restrict='yes' id='type-id-208'/>
+    <qualified-type-def type-id='type-id-127' const='yes' id='type-id-209'/>
+    <pointer-type-def type-id='type-id-209' size-in-bits='64' id='type-id-210'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-211'/>
+    <pointer-type-def type-id='type-id-211' size-in-bits='64' id='type-id-212'/>
+    <qualified-type-def type-id='type-id-131' const='yes' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-213' size-in-bits='64' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-133' const='yes' id='type-id-215'/>
+    <reference-type-def kind='lvalue' type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-217'/>
+    <qualified-type-def type-id='type-id-135' const='yes' id='type-id-218'/>
+    <reference-type-def kind='lvalue' type-id='type-id-218' size-in-bits='64' id='type-id-219'/>
+    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-220'/>
+    <qualified-type-def type-id='type-id-137' const='yes' id='type-id-221'/>
+    <reference-type-def kind='lvalue' type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-223'/>
+    <qualified-type-def type-id='type-id-139' const='yes' id='type-id-224'/>
+    <reference-type-def kind='lvalue' type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-226'/>
+    <qualified-type-def type-id='type-id-141' const='yes' id='type-id-227'/>
+    <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-228'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-229'/>
+    <qualified-type-def type-id='type-id-143' const='yes' id='type-id-230'/>
+    <reference-type-def kind='lvalue' type-id='type-id-230' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-230' size-in-bits='64' id='type-id-232'/>
+    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-233'/>
+    <reference-type-def kind='lvalue' type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-235'/>
+    <qualified-type-def type-id='type-id-147' const='yes' id='type-id-236'/>
     <reference-type-def kind='lvalue' type-id='type-id-236' size-in-bits='64' id='type-id-237'/>
-    <qualified-type-def type-id='type-id-147' const='yes' id='type-id-238'/>
-    <reference-type-def kind='lvalue' type-id='type-id-238' size-in-bits='64' id='type-id-239'/>
-    <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-240'/>
-    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-241'/>
-    <reference-type-def kind='lvalue' type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
-    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-243'/>
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-244'/>
-    <reference-type-def kind='lvalue' type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
-    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-246'/>
-    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-247'/>
-    <reference-type-def kind='lvalue' type-id='type-id-247' size-in-bits='64' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-249'/>
-    <qualified-type-def type-id='type-id-163' const='yes' id='type-id-250'/>
-    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <qualified-type-def type-id='type-id-165' const='yes' id='type-id-252'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
-    <qualified-type-def type-id='type-id-167' const='yes' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
-    <qualified-type-def type-id='type-id-169' const='yes' id='type-id-256'/>
-    <reference-type-def kind='lvalue' type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-258'/>
-    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-259'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
-    <qualified-type-def type-id='type-id-174' const='yes' id='type-id-261'/>
-    <reference-type-def kind='lvalue' type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
-    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-263'/>
-    <qualified-type-def type-id='type-id-177' const='yes' id='type-id-264'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-265'/>
-    <qualified-type-def type-id='type-id-179' const='yes' id='type-id-266'/>
-    <reference-type-def kind='lvalue' type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-266' size-in-bits='64' id='type-id-268'/>
+    <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-238'/>
+    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-239'/>
+    <reference-type-def kind='lvalue' type-id='type-id-239' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-241'/>
+    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-242'/>
+    <reference-type-def kind='lvalue' type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-244'/>
+    <qualified-type-def type-id='type-id-153' const='yes' id='type-id-245'/>
+    <reference-type-def kind='lvalue' type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-247'/>
+    <qualified-type-def type-id='type-id-77' const='yes' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-102'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-249'/>
+    <reference-type-def kind='lvalue' type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-253'/>
+    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-256'/>
+    <qualified-type-def type-id='type-id-168' const='yes' id='type-id-257'/>
+    <reference-type-def kind='lvalue' type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-259'/>
+    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-260'/>
+    <reference-type-def kind='lvalue' type-id='type-id-260' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-260' size-in-bits='64' id='type-id-262'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-264'/>
+    <qualified-type-def type-id='type-id-178' const='yes' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-265' size-in-bits='64' id='type-id-266'/>
+    <qualified-type-def type-id='type-id-180' const='yes' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-268'/>
     <qualified-type-def type-id='type-id-182' const='yes' id='type-id-269'/>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
+    <qualified-type-def type-id='type-id-185' const='yes' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-272' size-in-bits='64' id='type-id-273'/>
+    <qualified-type-def type-id='type-id-187' const='yes' id='type-id-274'/>
+    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-276'/>
+    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
+    <qualified-type-def type-id='type-id-192' const='yes' id='type-id-279'/>
+    <reference-type-def kind='lvalue' type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-281'/>
+    <qualified-type-def type-id='type-id-195' const='yes' id='type-id-282'/>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
     <qualified-type-def type-id='type-id-5' const='yes' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-58'/>
-    <qualified-type-def type-id='type-id-58' restrict='yes' id='type-id-271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-58' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-58' size-in-bits='64' id='type-id-273'/>
-    <qualified-type-def type-id='type-id-273' restrict='yes' id='type-id-274'/>
-    <reference-type-def kind='lvalue' type-id='type-id-30' size-in-bits='64' id='type-id-275'/>
-    <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-276'/>
-    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-277'/>
-    <reference-type-def kind='lvalue' type-id='type-id-33' size-in-bits='64' id='type-id-278'/>
-    <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-279'/>
-    <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-280'/>
-    <qualified-type-def type-id='type-id-80' const='yes' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-282'/>
-    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-283'/>
-    <qualified-type-def type-id='type-id-42' const='yes' id='type-id-284'/>
-    <reference-type-def kind='lvalue' type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
-    <qualified-type-def type-id='type-id-43' const='yes' id='type-id-286'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
-    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-288'/>
-    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-289'/>
-    <qualified-type-def type-id='type-id-290' const='yes' id='type-id-291'/>
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
-    <qualified-type-def type-id='type-id-293' const='yes' id='type-id-294'/>
-    <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-296'/>
-    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-298'/>
-    <reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-300'/>
-    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-302'/>
-    <reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
-    <qualified-type-def type-id='type-id-304' const='yes' id='type-id-305'/>
-    <reference-type-def kind='lvalue' type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-307'/>
-    <qualified-type-def type-id='type-id-308' const='yes' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
-    <qualified-type-def type-id='type-id-311' const='yes' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-63'/>
+    <qualified-type-def type-id='type-id-63' restrict='yes' id='type-id-284'/>
+    <reference-type-def kind='lvalue' type-id='type-id-63' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-286'/>
+    <qualified-type-def type-id='type-id-286' restrict='yes' id='type-id-287'/>
+    <reference-type-def kind='lvalue' type-id='type-id-30' size-in-bits='64' id='type-id-288'/>
+    <reference-type-def kind='lvalue' type-id='type-id-31' size-in-bits='64' id='type-id-289'/>
+    <reference-type-def kind='lvalue' type-id='type-id-32' size-in-bits='64' id='type-id-290'/>
+    <reference-type-def kind='lvalue' type-id='type-id-33' size-in-bits='64' id='type-id-291'/>
+    <reference-type-def kind='lvalue' type-id='type-id-34' size-in-bits='64' id='type-id-292'/>
+    <reference-type-def kind='lvalue' type-id='type-id-35' size-in-bits='64' id='type-id-293'/>
+    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
+    <qualified-type-def type-id='type-id-40' const='yes' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-44' const='yes' id='type-id-297'/>
+    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-45' const='yes' id='type-id-299'/>
+    <reference-type-def kind='lvalue' type-id='type-id-299' size-in-bits='64' id='type-id-300'/>
+    <qualified-type-def type-id='type-id-93' const='yes' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-302'/>
+    <qualified-type-def type-id='type-id-303' const='yes' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-306' const='yes' id='type-id-307'/>
+    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-309'/>
+    <qualified-type-def type-id='type-id-310' const='yes' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-313'/>
     <qualified-type-def type-id='type-id-314' const='yes' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
     <qualified-type-def type-id='type-id-317' const='yes' id='type-id-318'/>
     <reference-type-def kind='lvalue' type-id='type-id-318' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-320'/>
     <qualified-type-def type-id='type-id-321' const='yes' id='type-id-322'/>
-    <qualified-type-def type-id='type-id-323' const='yes' id='type-id-324'/>
-    <reference-type-def kind='lvalue' type-id='type-id-324' size-in-bits='64' id='type-id-325'/>
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-323'/>
+    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
     <qualified-type-def type-id='type-id-327' const='yes' id='type-id-328'/>
-    <qualified-type-def type-id='type-id-329' const='yes' id='type-id-330'/>
-    <reference-type-def kind='lvalue' type-id='type-id-330' size-in-bits='64' id='type-id-331'/>
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-332'/>
-    <qualified-type-def type-id='type-id-333' const='yes' id='type-id-334'/>
-    <reference-type-def kind='lvalue' type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-336'/>
-    <qualified-type-def type-id='type-id-337' const='yes' id='type-id-338'/>
-    <reference-type-def kind='lvalue' type-id='type-id-338' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-329'/>
+    <qualified-type-def type-id='type-id-330' const='yes' id='type-id-331'/>
+    <reference-type-def kind='lvalue' type-id='type-id-331' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-333'/>
+    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-335'/>
+    <qualified-type-def type-id='type-id-336' const='yes' id='type-id-337'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-339'/>
     <qualified-type-def type-id='type-id-340' const='yes' id='type-id-341'/>
-    <reference-type-def kind='lvalue' type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
-    <qualified-type-def type-id='type-id-343' const='yes' id='type-id-344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-346'/>
-    <qualified-type-def type-id='type-id-347' const='yes' id='type-id-348'/>
-    <reference-type-def kind='lvalue' type-id='type-id-348' size-in-bits='64' id='type-id-349'/>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-350'/>
-    <qualified-type-def type-id='type-id-351' const='yes' id='type-id-352'/>
-    <pointer-type-def type-id='type-id-352' size-in-bits='64' id='type-id-353'/>
-    <qualified-type-def type-id='type-id-354' const='yes' id='type-id-355'/>
-    <reference-type-def kind='lvalue' type-id='type-id-355' size-in-bits='64' id='type-id-356'/>
-    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-357'/>
-    <qualified-type-def type-id='type-id-358' const='yes' id='type-id-359'/>
-    <reference-type-def kind='lvalue' type-id='type-id-359' size-in-bits='64' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-361'/>
-    <qualified-type-def type-id='type-id-362' const='yes' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
-    <qualified-type-def type-id='type-id-365' const='yes' id='type-id-366'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-367'/>
-    <qualified-type-def type-id='type-id-368' const='yes' id='type-id-369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-369' size-in-bits='64' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-369' size-in-bits='64' id='type-id-371'/>
-    <qualified-type-def type-id='type-id-372' const='yes' id='type-id-373'/>
-    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-375'/>
-    <qualified-type-def type-id='type-id-376' const='yes' id='type-id-377'/>
-    <reference-type-def kind='lvalue' type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-379'/>
-    <qualified-type-def type-id='type-id-380' const='yes' id='type-id-381'/>
-    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-383'/>
-    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-387'/>
-    <qualified-type-def type-id='type-id-388' const='yes' id='type-id-389'/>
-    <reference-type-def kind='lvalue' type-id='type-id-389' size-in-bits='64' id='type-id-390'/>
-    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-391'/>
-    <qualified-type-def type-id='type-id-392' const='yes' id='type-id-393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
-    <qualified-type-def type-id='type-id-395' const='yes' id='type-id-396'/>
-    <reference-type-def kind='lvalue' type-id='type-id-396' size-in-bits='64' id='type-id-397'/>
-    <qualified-type-def type-id='type-id-398' const='yes' id='type-id-399'/>
-    <reference-type-def kind='lvalue' type-id='type-id-399' size-in-bits='64' id='type-id-400'/>
-    <pointer-type-def type-id='type-id-399' size-in-bits='64' id='type-id-401'/>
-    <qualified-type-def type-id='type-id-402' const='yes' id='type-id-403'/>
-    <reference-type-def kind='lvalue' type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-405'/>
-    <qualified-type-def type-id='type-id-406' const='yes' id='type-id-407'/>
-    <reference-type-def kind='lvalue' type-id='type-id-407' size-in-bits='64' id='type-id-408'/>
-    <qualified-type-def type-id='type-id-409' const='yes' id='type-id-410'/>
-    <reference-type-def kind='lvalue' type-id='type-id-410' size-in-bits='64' id='type-id-411'/>
-    <qualified-type-def type-id='type-id-412' const='yes' id='type-id-413'/>
-    <reference-type-def kind='lvalue' type-id='type-id-413' size-in-bits='64' id='type-id-414'/>
-    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-415'/>
-    <qualified-type-def type-id='type-id-416' const='yes' id='type-id-417'/>
-    <reference-type-def kind='lvalue' type-id='type-id-417' size-in-bits='64' id='type-id-418'/>
-    <pointer-type-def type-id='type-id-417' size-in-bits='64' id='type-id-419'/>
-    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-421'/>
-    <pointer-type-def type-id='type-id-421' size-in-bits='64' id='type-id-422'/>
-    <qualified-type-def type-id='type-id-423' const='yes' id='type-id-424'/>
-    <reference-type-def kind='lvalue' type-id='type-id-424' size-in-bits='64' id='type-id-425'/>
-    <pointer-type-def type-id='type-id-424' size-in-bits='64' id='type-id-426'/>
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-428'/>
-    <reference-type-def kind='lvalue' type-id='type-id-428' size-in-bits='64' id='type-id-429'/>
-    <pointer-type-def type-id='type-id-428' size-in-bits='64' id='type-id-430'/>
-    <qualified-type-def type-id='type-id-431' const='yes' id='type-id-432'/>
-    <reference-type-def kind='lvalue' type-id='type-id-432' size-in-bits='64' id='type-id-433'/>
-    <qualified-type-def type-id='type-id-434' const='yes' id='type-id-435'/>
-    <pointer-type-def type-id='type-id-435' size-in-bits='64' id='type-id-436'/>
-    <qualified-type-def type-id='type-id-437' const='yes' id='type-id-438'/>
-    <reference-type-def kind='lvalue' type-id='type-id-438' size-in-bits='64' id='type-id-439'/>
-    <pointer-type-def type-id='type-id-438' size-in-bits='64' id='type-id-440'/>
-    <qualified-type-def type-id='type-id-441' const='yes' id='type-id-442'/>
-    <reference-type-def kind='lvalue' type-id='type-id-442' size-in-bits='64' id='type-id-443'/>
-    <pointer-type-def type-id='type-id-442' size-in-bits='64' id='type-id-444'/>
-    <qualified-type-def type-id='type-id-445' const='yes' id='type-id-446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-446' size-in-bits='64' id='type-id-447'/>
-    <pointer-type-def type-id='type-id-446' size-in-bits='64' id='type-id-448'/>
-    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-450'/>
-    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-451'/>
-    <qualified-type-def type-id='type-id-452' const='yes' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-454'/>
-    <qualified-type-def type-id='type-id-455' const='yes' id='type-id-456'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <qualified-type-def type-id='type-id-458' const='yes' id='type-id-459'/>
-    <reference-type-def kind='lvalue' type-id='type-id-459' size-in-bits='64' id='type-id-460'/>
-    <pointer-type-def type-id='type-id-459' size-in-bits='64' id='type-id-461'/>
-    <qualified-type-def type-id='type-id-462' const='yes' id='type-id-463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-463' size-in-bits='64' id='type-id-464'/>
-    <qualified-type-def type-id='type-id-465' const='yes' id='type-id-466'/>
-    <reference-type-def kind='lvalue' type-id='type-id-466' size-in-bits='64' id='type-id-467'/>
-    <qualified-type-def type-id='type-id-468' const='yes' id='type-id-469'/>
-    <reference-type-def kind='lvalue' type-id='type-id-469' size-in-bits='64' id='type-id-470'/>
-    <qualified-type-def type-id='type-id-471' const='yes' id='type-id-472'/>
-    <reference-type-def kind='lvalue' type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
+    <qualified-type-def type-id='type-id-342' const='yes' id='type-id-343'/>
+    <reference-type-def kind='lvalue' type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-345'/>
+    <qualified-type-def type-id='type-id-346' const='yes' id='type-id-347'/>
+    <reference-type-def kind='lvalue' type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-349'/>
+    <qualified-type-def type-id='type-id-350' const='yes' id='type-id-351'/>
+    <reference-type-def kind='lvalue' type-id='type-id-351' size-in-bits='64' id='type-id-352'/>
+    <qualified-type-def type-id='type-id-353' const='yes' id='type-id-354'/>
+    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
+    <qualified-type-def type-id='type-id-356' const='yes' id='type-id-357'/>
+    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-359'/>
+    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-361'/>
+    <reference-type-def kind='lvalue' type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-363'/>
+    <qualified-type-def type-id='type-id-364' const='yes' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
+    <qualified-type-def type-id='type-id-367' const='yes' id='type-id-368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-370'/>
+    <qualified-type-def type-id='type-id-371' const='yes' id='type-id-372'/>
+    <reference-type-def kind='lvalue' type-id='type-id-372' size-in-bits='64' id='type-id-373'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-374'/>
+    <qualified-type-def type-id='type-id-375' const='yes' id='type-id-376'/>
+    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-377'/>
+    <qualified-type-def type-id='type-id-378' const='yes' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-380'/>
+    <qualified-type-def type-id='type-id-381' const='yes' id='type-id-382'/>
+    <reference-type-def kind='lvalue' type-id='type-id-382' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-384'/>
+    <qualified-type-def type-id='type-id-385' const='yes' id='type-id-386'/>
+    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-388'/>
+    <qualified-type-def type-id='type-id-389' const='yes' id='type-id-390'/>
+    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-391'/>
+    <pointer-type-def type-id='type-id-390' size-in-bits='64' id='type-id-392'/>
+    <qualified-type-def type-id='type-id-393' const='yes' id='type-id-394'/>
+    <reference-type-def kind='lvalue' type-id='type-id-394' size-in-bits='64' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-394' size-in-bits='64' id='type-id-396'/>
+    <qualified-type-def type-id='type-id-397' const='yes' id='type-id-398'/>
+    <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-399'/>
+    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-400'/>
+    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-402'/>
+    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-404'/>
+    <qualified-type-def type-id='type-id-405' const='yes' id='type-id-406'/>
+    <reference-type-def kind='lvalue' type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
+    <qualified-type-def type-id='type-id-408' const='yes' id='type-id-409'/>
+    <reference-type-def kind='lvalue' type-id='type-id-409' size-in-bits='64' id='type-id-410'/>
+    <qualified-type-def type-id='type-id-411' const='yes' id='type-id-412'/>
+    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-413'/>
+    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-414'/>
+    <qualified-type-def type-id='type-id-415' const='yes' id='type-id-416'/>
+    <reference-type-def kind='lvalue' type-id='type-id-416' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-418'/>
+    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-420'/>
+    <reference-type-def kind='lvalue' type-id='type-id-420' size-in-bits='64' id='type-id-421'/>
+    <qualified-type-def type-id='type-id-422' const='yes' id='type-id-423'/>
+    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-424'/>
+    <qualified-type-def type-id='type-id-425' const='yes' id='type-id-426'/>
+    <reference-type-def kind='lvalue' type-id='type-id-426' size-in-bits='64' id='type-id-427'/>
+    <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-428'/>
+    <qualified-type-def type-id='type-id-429' const='yes' id='type-id-430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-430' size-in-bits='64' id='type-id-431'/>
+    <pointer-type-def type-id='type-id-430' size-in-bits='64' id='type-id-432'/>
+    <qualified-type-def type-id='type-id-433' const='yes' id='type-id-434'/>
+    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-435'/>
+    <qualified-type-def type-id='type-id-436' const='yes' id='type-id-437'/>
+    <reference-type-def kind='lvalue' type-id='type-id-437' size-in-bits='64' id='type-id-438'/>
+    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-439'/>
+    <qualified-type-def type-id='type-id-440' const='yes' id='type-id-441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-443'/>
+    <qualified-type-def type-id='type-id-444' const='yes' id='type-id-445'/>
+    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-446'/>
+    <qualified-type-def type-id='type-id-447' const='yes' id='type-id-448'/>
+    <pointer-type-def type-id='type-id-448' size-in-bits='64' id='type-id-449'/>
+    <qualified-type-def type-id='type-id-118' const='yes' id='type-id-450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-450' size-in-bits='64' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-450' size-in-bits='64' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-453' const='yes' id='type-id-454'/>
+    <reference-type-def kind='lvalue' type-id='type-id-454' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-454' size-in-bits='64' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-457' const='yes' id='type-id-458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-460'/>
+    <qualified-type-def type-id='type-id-461' const='yes' id='type-id-462'/>
+    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-463'/>
+    <qualified-type-def type-id='type-id-464' const='yes' id='type-id-465'/>
+    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-466'/>
+    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-468'/>
+    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-469'/>
+    <qualified-type-def type-id='type-id-470' const='yes' id='type-id-471'/>
+    <reference-type-def kind='lvalue' type-id='type-id-471' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-473'/>
     <qualified-type-def type-id='type-id-474' const='yes' id='type-id-475'/>
     <reference-type-def kind='lvalue' type-id='type-id-475' size-in-bits='64' id='type-id-476'/>
     <qualified-type-def type-id='type-id-477' const='yes' id='type-id-478'/>
@@ -2306,18 +2303,18 @@
     <qualified-type-def type-id='type-id-492' const='yes' id='type-id-493'/>
     <reference-type-def kind='lvalue' type-id='type-id-493' size-in-bits='64' id='type-id-494'/>
     <qualified-type-def type-id='type-id-495' const='yes' id='type-id-496'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-497'/>
+    <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-497'/>
     <qualified-type-def type-id='type-id-498' const='yes' id='type-id-499'/>
     <reference-type-def kind='lvalue' type-id='type-id-499' size-in-bits='64' id='type-id-500'/>
-    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-501'/>
-    <qualified-type-def type-id='type-id-502' const='yes' id='type-id-503'/>
-    <reference-type-def kind='lvalue' type-id='type-id-503' size-in-bits='64' id='type-id-504'/>
-    <qualified-type-def type-id='type-id-505' const='yes' id='type-id-506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-506' size-in-bits='64' id='type-id-507'/>
-    <qualified-type-def type-id='type-id-508' const='yes' id='type-id-509'/>
-    <reference-type-def kind='lvalue' type-id='type-id-509' size-in-bits='64' id='type-id-510'/>
-    <qualified-type-def type-id='type-id-511' const='yes' id='type-id-512'/>
-    <reference-type-def kind='lvalue' type-id='type-id-512' size-in-bits='64' id='type-id-513'/>
+    <qualified-type-def type-id='type-id-501' const='yes' id='type-id-502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-503'/>
+    <qualified-type-def type-id='type-id-504' const='yes' id='type-id-505'/>
+    <reference-type-def kind='lvalue' type-id='type-id-505' size-in-bits='64' id='type-id-506'/>
+    <qualified-type-def type-id='type-id-507' const='yes' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-508' size-in-bits='64' id='type-id-509'/>
+    <qualified-type-def type-id='type-id-510' const='yes' id='type-id-511'/>
+    <reference-type-def kind='lvalue' type-id='type-id-511' size-in-bits='64' id='type-id-512'/>
+    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-513'/>
     <qualified-type-def type-id='type-id-514' const='yes' id='type-id-515'/>
     <reference-type-def kind='lvalue' type-id='type-id-515' size-in-bits='64' id='type-id-516'/>
     <qualified-type-def type-id='type-id-517' const='yes' id='type-id-518'/>
@@ -2385,70 +2382,70 @@
     <qualified-type-def type-id='type-id-610' const='yes' id='type-id-611'/>
     <reference-type-def kind='lvalue' type-id='type-id-611' size-in-bits='64' id='type-id-612'/>
     <qualified-type-def type-id='type-id-613' const='yes' id='type-id-614'/>
-    <pointer-type-def type-id='type-id-614' size-in-bits='64' id='type-id-615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-614' size-in-bits='64' id='type-id-615'/>
     <qualified-type-def type-id='type-id-616' const='yes' id='type-id-617'/>
     <reference-type-def kind='lvalue' type-id='type-id-617' size-in-bits='64' id='type-id-618'/>
     <qualified-type-def type-id='type-id-619' const='yes' id='type-id-620'/>
-    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-620' size-in-bits='64' id='type-id-621'/>
     <qualified-type-def type-id='type-id-622' const='yes' id='type-id-623'/>
     <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-624'/>
     <qualified-type-def type-id='type-id-625' const='yes' id='type-id-626'/>
-    <reference-type-def kind='lvalue' type-id='type-id-626' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-628'/>
-    <qualified-type-def type-id='type-id-629' const='yes' id='type-id-630'/>
-    <reference-type-def kind='lvalue' type-id='type-id-630' size-in-bits='64' id='type-id-631'/>
-    <qualified-type-def type-id='type-id-632' const='yes' id='type-id-633'/>
-    <reference-type-def kind='lvalue' type-id='type-id-633' size-in-bits='64' id='type-id-634'/>
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-636'/>
-    <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-637'/>
-    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-638'/>
-    <qualified-type-def type-id='type-id-639' const='yes' id='type-id-640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-640' size-in-bits='64' id='type-id-641'/>
-    <qualified-type-def type-id='type-id-642' const='yes' id='type-id-643'/>
-    <reference-type-def kind='lvalue' type-id='type-id-643' size-in-bits='64' id='type-id-644'/>
-    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-646' size-in-bits='64' id='type-id-647'/>
-    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-649'/>
-    <reference-type-def kind='lvalue' type-id='type-id-649' size-in-bits='64' id='type-id-650'/>
+    <pointer-type-def type-id='type-id-626' size-in-bits='64' id='type-id-627'/>
+    <qualified-type-def type-id='type-id-628' const='yes' id='type-id-629'/>
+    <reference-type-def kind='lvalue' type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
+    <qualified-type-def type-id='type-id-631' const='yes' id='type-id-632'/>
+    <pointer-type-def type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
+    <qualified-type-def type-id='type-id-634' const='yes' id='type-id-635'/>
+    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-636'/>
+    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-638' size-in-bits='64' id='type-id-639'/>
+    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-640'/>
+    <qualified-type-def type-id='type-id-641' const='yes' id='type-id-642'/>
+    <reference-type-def kind='lvalue' type-id='type-id-642' size-in-bits='64' id='type-id-643'/>
+    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <qualified-type-def type-id='type-id-647' const='yes' id='type-id-648'/>
+    <reference-type-def kind='lvalue' type-id='type-id-648' size-in-bits='64' id='type-id-649'/>
+    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-650'/>
     <qualified-type-def type-id='type-id-651' const='yes' id='type-id-652'/>
-    <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
+    <reference-type-def kind='lvalue' type-id='type-id-652' size-in-bits='64' id='type-id-653'/>
     <qualified-type-def type-id='type-id-654' const='yes' id='type-id-655'/>
     <reference-type-def kind='lvalue' type-id='type-id-655' size-in-bits='64' id='type-id-656'/>
     <qualified-type-def type-id='type-id-657' const='yes' id='type-id-658'/>
-    <reference-type-def kind='lvalue' type-id='type-id-658' size-in-bits='64' id='type-id-659'/>
-    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-660'/>
-    <qualified-type-def type-id='type-id-661' const='yes' id='type-id-662'/>
-    <reference-type-def kind='lvalue' type-id='type-id-662' size-in-bits='64' id='type-id-663'/>
-    <pointer-type-def type-id='type-id-662' size-in-bits='64' id='type-id-664'/>
-    <qualified-type-def type-id='type-id-665' const='yes' id='type-id-666'/>
-    <pointer-type-def type-id='type-id-666' size-in-bits='64' id='type-id-667'/>
-    <qualified-type-def type-id='type-id-668' const='yes' id='type-id-669'/>
-    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-670'/>
-    <qualified-type-def type-id='type-id-671' const='yes' id='type-id-672'/>
-    <pointer-type-def type-id='type-id-672' size-in-bits='64' id='type-id-673'/>
-    <qualified-type-def type-id='type-id-674' const='yes' id='type-id-675'/>
-    <reference-type-def kind='lvalue' type-id='type-id-675' size-in-bits='64' id='type-id-676'/>
+    <pointer-type-def type-id='type-id-658' size-in-bits='64' id='type-id-659'/>
+    <qualified-type-def type-id='type-id-660' const='yes' id='type-id-661'/>
+    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-662'/>
+    <qualified-type-def type-id='type-id-663' const='yes' id='type-id-664'/>
+    <pointer-type-def type-id='type-id-664' size-in-bits='64' id='type-id-665'/>
+    <qualified-type-def type-id='type-id-666' const='yes' id='type-id-667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-667' size-in-bits='64' id='type-id-668'/>
+    <qualified-type-def type-id='type-id-669' const='yes' id='type-id-670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-670' size-in-bits='64' id='type-id-671'/>
+    <pointer-type-def type-id='type-id-670' size-in-bits='64' id='type-id-672'/>
+    <qualified-type-def type-id='type-id-673' const='yes' id='type-id-674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-674' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-674' size-in-bits='64' id='type-id-676'/>
     <qualified-type-def type-id='type-id-677' const='yes' id='type-id-678'/>
-    <reference-type-def kind='lvalue' type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
+    <pointer-type-def type-id='type-id-678' size-in-bits='64' id='type-id-679'/>
     <qualified-type-def type-id='type-id-680' const='yes' id='type-id-681'/>
-    <reference-type-def kind='lvalue' type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
-    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-683'/>
-    <qualified-type-def type-id='type-id-684' const='yes' id='type-id-685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-685' size-in-bits='64' id='type-id-686'/>
-    <qualified-type-def type-id='type-id-687' const='yes' id='type-id-688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-688' size-in-bits='64' id='type-id-689'/>
-    <pointer-type-def type-id='type-id-688' size-in-bits='64' id='type-id-690'/>
-    <qualified-type-def type-id='type-id-691' const='yes' id='type-id-692'/>
-    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-693'/>
-    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-694'/>
-    <qualified-type-def type-id='type-id-695' const='yes' id='type-id-696'/>
-    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-697'/>
-    <qualified-type-def type-id='type-id-698' const='yes' id='type-id-699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-700'/>
-    <qualified-type-def type-id='type-id-701' const='yes' id='type-id-702'/>
-    <reference-type-def kind='lvalue' type-id='type-id-702' size-in-bits='64' id='type-id-703'/>
-    <qualified-type-def type-id='type-id-704' const='yes' id='type-id-705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-705' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-681' size-in-bits='64' id='type-id-682'/>
+    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-684'/>
+    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-685'/>
+    <qualified-type-def type-id='type-id-686' const='yes' id='type-id-687'/>
+    <reference-type-def kind='lvalue' type-id='type-id-687' size-in-bits='64' id='type-id-688'/>
+    <qualified-type-def type-id='type-id-689' const='yes' id='type-id-690'/>
+    <reference-type-def kind='lvalue' type-id='type-id-690' size-in-bits='64' id='type-id-691'/>
+    <qualified-type-def type-id='type-id-692' const='yes' id='type-id-693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-693' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-693' size-in-bits='64' id='type-id-695'/>
+    <qualified-type-def type-id='type-id-696' const='yes' id='type-id-697'/>
+    <reference-type-def kind='lvalue' type-id='type-id-697' size-in-bits='64' id='type-id-698'/>
+    <qualified-type-def type-id='type-id-699' const='yes' id='type-id-700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-700' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-700' size-in-bits='64' id='type-id-702'/>
+    <qualified-type-def type-id='type-id-703' const='yes' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-705'/>
+    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-706'/>
     <qualified-type-def type-id='type-id-707' const='yes' id='type-id-708'/>
     <reference-type-def kind='lvalue' type-id='type-id-708' size-in-bits='64' id='type-id-709'/>
     <qualified-type-def type-id='type-id-710' const='yes' id='type-id-711'/>
@@ -2596,73 +2593,72 @@
     <qualified-type-def type-id='type-id-923' const='yes' id='type-id-924'/>
     <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-925'/>
     <qualified-type-def type-id='type-id-926' const='yes' id='type-id-927'/>
-    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
+    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-928'/>
     <qualified-type-def type-id='type-id-929' const='yes' id='type-id-930'/>
     <reference-type-def kind='lvalue' type-id='type-id-930' size-in-bits='64' id='type-id-931'/>
     <qualified-type-def type-id='type-id-932' const='yes' id='type-id-933'/>
     <reference-type-def kind='lvalue' type-id='type-id-933' size-in-bits='64' id='type-id-934'/>
     <qualified-type-def type-id='type-id-935' const='yes' id='type-id-936'/>
     <reference-type-def kind='lvalue' type-id='type-id-936' size-in-bits='64' id='type-id-937'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-938'/>
-    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-940'/>
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-941'/>
-    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-943'/>
-    <reference-type-def kind='lvalue' type-id='type-id-943' size-in-bits='64' id='type-id-944'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-946'/>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-947'/>
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-949'/>
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-950'/>
+    <qualified-type-def type-id='type-id-938' const='yes' id='type-id-939'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-940'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-942'/>
+    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-943'/>
+    <qualified-type-def type-id='type-id-944' const='yes' id='type-id-945'/>
+    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-946'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-948'/>
+    <reference-type-def kind='lvalue' type-id='type-id-948' size-in-bits='64' id='type-id-949'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-950'/>
     <qualified-type-def type-id='type-id-951' const='yes' id='type-id-952'/>
-    <reference-type-def kind='lvalue' type-id='type-id-952' size-in-bits='64' id='type-id-953'/>
-    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-954'/>
-    <qualified-type-def type-id='type-id-955' const='yes' id='type-id-956'/>
-    <pointer-type-def type-id='type-id-956' size-in-bits='64' id='type-id-957'/>
-    <qualified-type-def type-id='type-id-958' const='yes' id='type-id-959'/>
-    <reference-type-def kind='lvalue' type-id='type-id-959' size-in-bits='64' id='type-id-960'/>
-    <pointer-type-def type-id='type-id-959' size-in-bits='64' id='type-id-961'/>
-    <qualified-type-def type-id='type-id-962' const='yes' id='type-id-963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-963' size-in-bits='64' id='type-id-964'/>
-    <qualified-type-def type-id='type-id-965' const='yes' id='type-id-966'/>
-    <pointer-type-def type-id='type-id-966' size-in-bits='64' id='type-id-967'/>
-    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-969'/>
-    <reference-type-def kind='lvalue' type-id='type-id-969' size-in-bits='64' id='type-id-970'/>
-    <qualified-type-def type-id='type-id-971' const='yes' id='type-id-972'/>
-    <reference-type-def kind='lvalue' type-id='type-id-972' size-in-bits='64' id='type-id-973'/>
+    <pointer-type-def type-id='type-id-952' size-in-bits='64' id='type-id-953'/>
+    <qualified-type-def type-id='type-id-954' const='yes' id='type-id-955'/>
+    <reference-type-def kind='lvalue' type-id='type-id-955' size-in-bits='64' id='type-id-956'/>
+    <qualified-type-def type-id='type-id-957' const='yes' id='type-id-958'/>
+    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-959'/>
+    <qualified-type-def type-id='type-id-960' const='yes' id='type-id-961'/>
+    <pointer-type-def type-id='type-id-961' size-in-bits='64' id='type-id-962'/>
+    <qualified-type-def type-id='type-id-963' const='yes' id='type-id-964'/>
+    <reference-type-def kind='lvalue' type-id='type-id-964' size-in-bits='64' id='type-id-965'/>
+    <pointer-type-def type-id='type-id-964' size-in-bits='64' id='type-id-966'/>
+    <qualified-type-def type-id='type-id-967' const='yes' id='type-id-968'/>
+    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-969'/>
+    <qualified-type-def type-id='type-id-970' const='yes' id='type-id-971'/>
+    <reference-type-def kind='lvalue' type-id='type-id-971' size-in-bits='64' id='type-id-972'/>
+    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-973'/>
     <qualified-type-def type-id='type-id-974' const='yes' id='type-id-975'/>
     <reference-type-def kind='lvalue' type-id='type-id-975' size-in-bits='64' id='type-id-976'/>
     <qualified-type-def type-id='type-id-977' const='yes' id='type-id-978'/>
-    <reference-type-def kind='lvalue' type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
+    <pointer-type-def type-id='type-id-978' size-in-bits='64' id='type-id-979'/>
     <qualified-type-def type-id='type-id-980' const='yes' id='type-id-981'/>
     <reference-type-def kind='lvalue' type-id='type-id-981' size-in-bits='64' id='type-id-982'/>
     <qualified-type-def type-id='type-id-983' const='yes' id='type-id-984'/>
     <reference-type-def kind='lvalue' type-id='type-id-984' size-in-bits='64' id='type-id-985'/>
     <qualified-type-def type-id='type-id-986' const='yes' id='type-id-987'/>
-    <pointer-type-def type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
+    <reference-type-def kind='lvalue' type-id='type-id-987' size-in-bits='64' id='type-id-988'/>
     <qualified-type-def type-id='type-id-989' const='yes' id='type-id-990'/>
-    <pointer-type-def type-id='type-id-990' size-in-bits='64' id='type-id-991'/>
+    <reference-type-def kind='lvalue' type-id='type-id-990' size-in-bits='64' id='type-id-991'/>
     <qualified-type-def type-id='type-id-992' const='yes' id='type-id-993'/>
     <reference-type-def kind='lvalue' type-id='type-id-993' size-in-bits='64' id='type-id-994'/>
     <qualified-type-def type-id='type-id-995' const='yes' id='type-id-996'/>
     <reference-type-def kind='lvalue' type-id='type-id-996' size-in-bits='64' id='type-id-997'/>
-    <pointer-type-def type-id='type-id-996' size-in-bits='64' id='type-id-998'/>
-    <qualified-type-def type-id='type-id-999' const='yes' id='type-id-1000'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1000' size-in-bits='64' id='type-id-1001'/>
-    <pointer-type-def type-id='type-id-1000' size-in-bits='64' id='type-id-1002'/>
-    <qualified-type-def type-id='type-id-1003' const='yes' id='type-id-1004'/>
-    <pointer-type-def type-id='type-id-1004' size-in-bits='64' id='type-id-1005'/>
-    <qualified-type-def type-id='type-id-1006' const='yes' id='type-id-1007'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-1008'/>
-    <qualified-type-def type-id='type-id-1009' const='yes' id='type-id-1010'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1010' size-in-bits='64' id='type-id-1011'/>
-    <qualified-type-def type-id='type-id-1012' const='yes' id='type-id-1013'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
-    <pointer-type-def type-id='type-id-1013' size-in-bits='64' id='type-id-1015'/>
-    <qualified-type-def type-id='type-id-1016' const='yes' id='type-id-1017'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
-    <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1019'/>
-    <qualified-type-def type-id='type-id-1020' const='yes' id='type-id-1021'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1021' size-in-bits='64' id='type-id-1022'/>
-    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1023'/>
+    <qualified-type-def type-id='type-id-998' const='yes' id='type-id-999'/>
+    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1000'/>
+    <qualified-type-def type-id='type-id-1001' const='yes' id='type-id-1002'/>
+    <pointer-type-def type-id='type-id-1002' size-in-bits='64' id='type-id-1003'/>
+    <qualified-type-def type-id='type-id-1004' const='yes' id='type-id-1005'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1005' size-in-bits='64' id='type-id-1006'/>
+    <qualified-type-def type-id='type-id-1007' const='yes' id='type-id-1008'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1008' size-in-bits='64' id='type-id-1009'/>
+    <pointer-type-def type-id='type-id-1008' size-in-bits='64' id='type-id-1010'/>
+    <qualified-type-def type-id='type-id-1011' const='yes' id='type-id-1012'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1013'/>
+    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1014'/>
+    <qualified-type-def type-id='type-id-1015' const='yes' id='type-id-1016'/>
+    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1017'/>
+    <qualified-type-def type-id='type-id-1018' const='yes' id='type-id-1019'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1019' size-in-bits='64' id='type-id-1020'/>
+    <qualified-type-def type-id='type-id-1021' const='yes' id='type-id-1022'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1022' size-in-bits='64' id='type-id-1023'/>
     <qualified-type-def type-id='type-id-1024' const='yes' id='type-id-1025'/>
     <reference-type-def kind='lvalue' type-id='type-id-1025' size-in-bits='64' id='type-id-1026'/>
     <pointer-type-def type-id='type-id-1025' size-in-bits='64' id='type-id-1027'/>
@@ -2677,19 +2673,20 @@
     <pointer-type-def type-id='type-id-1037' size-in-bits='64' id='type-id-1039'/>
     <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-1041'/>
     <reference-type-def kind='lvalue' type-id='type-id-1041' size-in-bits='64' id='type-id-1042'/>
-    <qualified-type-def type-id='type-id-1043' const='yes' id='type-id-1044'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-1045'/>
-    <qualified-type-def type-id='type-id-1046' const='yes' id='type-id-1047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1048'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1047' size-in-bits='64' id='type-id-1049'/>
-    <qualified-type-def type-id='type-id-1050' const='yes' id='type-id-1051'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1051' size-in-bits='64' id='type-id-1052'/>
-    <qualified-type-def type-id='type-id-1053' const='yes' id='type-id-1054'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1054' size-in-bits='64' id='type-id-1055'/>
-    <qualified-type-def type-id='type-id-1056' const='yes' id='type-id-1057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1057' size-in-bits='64' id='type-id-1058'/>
-    <qualified-type-def type-id='type-id-1059' const='yes' id='type-id-1060'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1060' size-in-bits='64' id='type-id-1061'/>
+    <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-1043'/>
+    <qualified-type-def type-id='type-id-1044' const='yes' id='type-id-1045'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1045' size-in-bits='64' id='type-id-1046'/>
+    <pointer-type-def type-id='type-id-1045' size-in-bits='64' id='type-id-1047'/>
+    <qualified-type-def type-id='type-id-1048' const='yes' id='type-id-1049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1049' size-in-bits='64' id='type-id-1050'/>
+    <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1051'/>
+    <qualified-type-def type-id='type-id-1052' const='yes' id='type-id-1053'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1053' size-in-bits='64' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-1055' const='yes' id='type-id-1056'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1056' size-in-bits='64' id='type-id-1057'/>
+    <qualified-type-def type-id='type-id-1058' const='yes' id='type-id-1059'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1060'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-1061'/>
     <qualified-type-def type-id='type-id-1062' const='yes' id='type-id-1063'/>
     <reference-type-def kind='lvalue' type-id='type-id-1063' size-in-bits='64' id='type-id-1064'/>
     <qualified-type-def type-id='type-id-1065' const='yes' id='type-id-1066'/>
@@ -2698,37 +2695,36 @@
     <reference-type-def kind='lvalue' type-id='type-id-1069' size-in-bits='64' id='type-id-1070'/>
     <qualified-type-def type-id='type-id-1071' const='yes' id='type-id-1072'/>
     <reference-type-def kind='lvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1073'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1072' size-in-bits='64' id='type-id-1074'/>
-    <qualified-type-def type-id='type-id-1075' const='yes' id='type-id-1076'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <qualified-type-def type-id='type-id-1078' const='yes' id='type-id-1079'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1079' size-in-bits='64' id='type-id-1080'/>
-    <qualified-type-def type-id='type-id-1081' const='yes' id='type-id-1082'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-1083'/>
-    <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1084'/>
-    <qualified-type-def type-id='type-id-1085' const='yes' id='type-id-1086'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-1087'/>
-    <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1088'/>
-    <qualified-type-def type-id='type-id-1089' const='yes' id='type-id-1090'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-1091'/>
-    <qualified-type-def type-id='type-id-1092' const='yes' id='type-id-1093'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-1094'/>
-    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-1096' const='yes' id='type-id-1097'/>
-    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-1098'/>
-    <qualified-type-def type-id='type-id-1099' const='yes' id='type-id-1100'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
-    <qualified-type-def type-id='type-id-1102' const='yes' id='type-id-1103'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-1104'/>
-    <qualified-type-def type-id='type-id-1105' const='yes' id='type-id-1106'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1106' size-in-bits='64' id='type-id-1107'/>
-    <pointer-type-def type-id='type-id-1106' size-in-bits='64' id='type-id-1108'/>
-    <qualified-type-def type-id='type-id-1109' const='yes' id='type-id-1110'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1110' size-in-bits='64' id='type-id-1111'/>
-    <pointer-type-def type-id='type-id-1110' size-in-bits='64' id='type-id-1112'/>
-    <qualified-type-def type-id='type-id-1113' const='yes' id='type-id-1114'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-1115'/>
-    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-1116'/>
+    <qualified-type-def type-id='type-id-1074' const='yes' id='type-id-1075'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1075' size-in-bits='64' id='type-id-1076'/>
+    <qualified-type-def type-id='type-id-1077' const='yes' id='type-id-1078'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1078' size-in-bits='64' id='type-id-1079'/>
+    <qualified-type-def type-id='type-id-1080' const='yes' id='type-id-1081'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-1083' const='yes' id='type-id-1084'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1084' size-in-bits='64' id='type-id-1085'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1084' size-in-bits='64' id='type-id-1086'/>
+    <qualified-type-def type-id='type-id-1087' const='yes' id='type-id-1088'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1088' size-in-bits='64' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-1090' const='yes' id='type-id-1091'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-1092'/>
+    <qualified-type-def type-id='type-id-1093' const='yes' id='type-id-1094'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1094' size-in-bits='64' id='type-id-1095'/>
+    <pointer-type-def type-id='type-id-1094' size-in-bits='64' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-1097' const='yes' id='type-id-1098'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
+    <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1100'/>
+    <qualified-type-def type-id='type-id-1101' const='yes' id='type-id-1102'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1102' size-in-bits='64' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-1104' const='yes' id='type-id-1105'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1105' size-in-bits='64' id='type-id-1106'/>
+    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-1107'/>
+    <qualified-type-def type-id='type-id-1108' const='yes' id='type-id-1109'/>
+    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-1110'/>
+    <qualified-type-def type-id='type-id-1111' const='yes' id='type-id-1112'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1112' size-in-bits='64' id='type-id-1113'/>
+    <qualified-type-def type-id='type-id-1114' const='yes' id='type-id-1115'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1115' size-in-bits='64' id='type-id-1116'/>
     <qualified-type-def type-id='type-id-1117' const='yes' id='type-id-1118'/>
     <reference-type-def kind='lvalue' type-id='type-id-1118' size-in-bits='64' id='type-id-1119'/>
     <pointer-type-def type-id='type-id-1118' size-in-bits='64' id='type-id-1120'/>
@@ -2757,59 +2753,60 @@
     <reference-type-def kind='lvalue' type-id='type-id-1150' size-in-bits='64' id='type-id-1151'/>
     <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-1152'/>
     <qualified-type-def type-id='type-id-1153' const='yes' id='type-id-1154'/>
-    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
-    <qualified-type-def type-id='type-id-1156' const='yes' id='type-id-1157'/>
-    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-1158'/>
-    <qualified-type-def type-id='type-id-1159' const='yes' id='type-id-1160'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1160' size-in-bits='64' id='type-id-1161'/>
-    <pointer-type-def type-id='type-id-1160' size-in-bits='64' id='type-id-1162'/>
-    <qualified-type-def type-id='type-id-1163' const='yes' id='type-id-1164'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1164' size-in-bits='64' id='type-id-1165'/>
-    <qualified-type-def type-id='type-id-1166' const='yes' id='type-id-1167'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1167' size-in-bits='64' id='type-id-1168'/>
-    <qualified-type-def type-id='type-id-1169' const='yes' id='type-id-1170'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1170' size-in-bits='64' id='type-id-1171'/>
-    <pointer-type-def type-id='type-id-1170' size-in-bits='64' id='type-id-1172'/>
-    <qualified-type-def type-id='type-id-1173' const='yes' id='type-id-1174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1174' size-in-bits='64' id='type-id-1175'/>
-    <qualified-type-def type-id='type-id-1176' const='yes' id='type-id-1177'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1177' size-in-bits='64' id='type-id-1178'/>
-    <qualified-type-def type-id='type-id-1179' const='yes' id='type-id-1180'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1180' size-in-bits='64' id='type-id-1181'/>
-    <qualified-type-def type-id='type-id-1182' const='yes' id='type-id-1183'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1183' size-in-bits='64' id='type-id-1184'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1154' size-in-bits='64' id='type-id-1155'/>
+    <pointer-type-def type-id='type-id-1154' size-in-bits='64' id='type-id-1156'/>
+    <qualified-type-def type-id='type-id-1157' const='yes' id='type-id-1158'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1158' size-in-bits='64' id='type-id-1159'/>
+    <pointer-type-def type-id='type-id-1158' size-in-bits='64' id='type-id-1160'/>
+    <qualified-type-def type-id='type-id-1161' const='yes' id='type-id-1162'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1162' size-in-bits='64' id='type-id-1163'/>
+    <pointer-type-def type-id='type-id-1162' size-in-bits='64' id='type-id-1164'/>
+    <qualified-type-def type-id='type-id-1165' const='yes' id='type-id-1166'/>
+    <pointer-type-def type-id='type-id-1166' size-in-bits='64' id='type-id-1167'/>
+    <qualified-type-def type-id='type-id-1168' const='yes' id='type-id-1169'/>
+    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-1170'/>
+    <qualified-type-def type-id='type-id-1171' const='yes' id='type-id-1172'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1172' size-in-bits='64' id='type-id-1173'/>
+    <pointer-type-def type-id='type-id-1172' size-in-bits='64' id='type-id-1174'/>
+    <qualified-type-def type-id='type-id-1175' const='yes' id='type-id-1176'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-1177'/>
+    <qualified-type-def type-id='type-id-1178' const='yes' id='type-id-1179'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1179' size-in-bits='64' id='type-id-1180'/>
+    <qualified-type-def type-id='type-id-1181' const='yes' id='type-id-1182'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-1183'/>
+    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-1184'/>
     <qualified-type-def type-id='type-id-1185' const='yes' id='type-id-1186'/>
     <reference-type-def kind='lvalue' type-id='type-id-1186' size-in-bits='64' id='type-id-1187'/>
     <qualified-type-def type-id='type-id-1188' const='yes' id='type-id-1189'/>
     <reference-type-def kind='lvalue' type-id='type-id-1189' size-in-bits='64' id='type-id-1190'/>
-    <pointer-type-def type-id='type-id-1189' size-in-bits='64' id='type-id-1191'/>
-    <qualified-type-def type-id='type-id-1192' const='yes' id='type-id-1193'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1193' size-in-bits='64' id='type-id-1194'/>
-    <qualified-type-def type-id='type-id-1195' const='yes' id='type-id-1196'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1196' size-in-bits='64' id='type-id-1197'/>
-    <qualified-type-def type-id='type-id-1198' const='yes' id='type-id-1199'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1199' size-in-bits='64' id='type-id-1200'/>
-    <qualified-type-def type-id='type-id-1201' const='yes' id='type-id-1202'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1202' size-in-bits='64' id='type-id-1203'/>
+    <qualified-type-def type-id='type-id-1191' const='yes' id='type-id-1192'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-1193'/>
+    <qualified-type-def type-id='type-id-1194' const='yes' id='type-id-1195'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-1196'/>
+    <qualified-type-def type-id='type-id-1197' const='yes' id='type-id-1198'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1198' size-in-bits='64' id='type-id-1199'/>
+    <qualified-type-def type-id='type-id-1200' const='yes' id='type-id-1201'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-1202'/>
+    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-1203'/>
     <qualified-type-def type-id='type-id-1204' const='yes' id='type-id-1205'/>
     <reference-type-def kind='lvalue' type-id='type-id-1205' size-in-bits='64' id='type-id-1206'/>
     <qualified-type-def type-id='type-id-1207' const='yes' id='type-id-1208'/>
     <reference-type-def kind='lvalue' type-id='type-id-1208' size-in-bits='64' id='type-id-1209'/>
-    <qualified-type-def type-id='type-id-92' const='yes' id='type-id-1210'/>
-    <qualified-type-def type-id='type-id-1211' const='yes' id='type-id-1212'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1212' size-in-bits='64' id='type-id-1213'/>
-    <pointer-type-def type-id='type-id-1212' size-in-bits='64' id='type-id-1214'/>
-    <qualified-type-def type-id='type-id-1215' const='yes' id='type-id-1216'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-1217'/>
-    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-1218'/>
+    <qualified-type-def type-id='type-id-1210' const='yes' id='type-id-1211'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-1212'/>
+    <qualified-type-def type-id='type-id-1213' const='yes' id='type-id-1214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1214' size-in-bits='64' id='type-id-1215'/>
+    <qualified-type-def type-id='type-id-1216' const='yes' id='type-id-1217'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1217' size-in-bits='64' id='type-id-1218'/>
     <qualified-type-def type-id='type-id-1219' const='yes' id='type-id-1220'/>
     <reference-type-def kind='lvalue' type-id='type-id-1220' size-in-bits='64' id='type-id-1221'/>
-    <qualified-type-def type-id='type-id-1222' const='yes' id='type-id-1223'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-1224'/>
-    <qualified-type-def type-id='type-id-1225' const='yes' id='type-id-1226'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1226' size-in-bits='64' id='type-id-1227'/>
-    <qualified-type-def type-id='type-id-1228' const='yes' id='type-id-1229'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1229' size-in-bits='64' id='type-id-1230'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-1222'/>
+    <qualified-type-def type-id='type-id-1223' const='yes' id='type-id-1224'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1224' size-in-bits='64' id='type-id-1225'/>
+    <pointer-type-def type-id='type-id-1224' size-in-bits='64' id='type-id-1226'/>
+    <qualified-type-def type-id='type-id-1227' const='yes' id='type-id-1228'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1228' size-in-bits='64' id='type-id-1229'/>
+    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-1230'/>
     <qualified-type-def type-id='type-id-1231' const='yes' id='type-id-1232'/>
     <reference-type-def kind='lvalue' type-id='type-id-1232' size-in-bits='64' id='type-id-1233'/>
     <qualified-type-def type-id='type-id-1234' const='yes' id='type-id-1235'/>
@@ -2840,61 +2837,61 @@
     <reference-type-def kind='lvalue' type-id='type-id-1271' size-in-bits='64' id='type-id-1272'/>
     <qualified-type-def type-id='type-id-1273' const='yes' id='type-id-1274'/>
     <reference-type-def kind='lvalue' type-id='type-id-1274' size-in-bits='64' id='type-id-1275'/>
-    <pointer-type-def type-id='type-id-1274' size-in-bits='64' id='type-id-1276'/>
-    <qualified-type-def type-id='type-id-1277' const='yes' id='type-id-1278'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1278' size-in-bits='64' id='type-id-1279'/>
-    <pointer-type-def type-id='type-id-1278' size-in-bits='64' id='type-id-1280'/>
-    <qualified-type-def type-id='type-id-1281' const='yes' id='type-id-1282'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-1283'/>
-    <qualified-type-def type-id='type-id-1284' const='yes' id='type-id-1285'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-1286'/>
-    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-1287'/>
-    <qualified-type-def type-id='type-id-1288' const='yes' id='type-id-1289'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1289' size-in-bits='64' id='type-id-1290'/>
-    <qualified-type-def type-id='type-id-1291' const='yes' id='type-id-1292'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1292' size-in-bits='64' id='type-id-1293'/>
-    <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1294'/>
-    <qualified-type-def type-id='type-id-1295' const='yes' id='type-id-1296'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1296' size-in-bits='64' id='type-id-1297'/>
-    <qualified-type-def type-id='type-id-1298' const='yes' id='type-id-1299'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1299' size-in-bits='64' id='type-id-1300'/>
-    <pointer-type-def type-id='type-id-1299' size-in-bits='64' id='type-id-1301'/>
-    <qualified-type-def type-id='type-id-1302' const='yes' id='type-id-1303'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-1304'/>
-    <qualified-type-def type-id='type-id-1305' const='yes' id='type-id-1306'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1306' size-in-bits='64' id='type-id-1307'/>
-    <pointer-type-def type-id='type-id-1306' size-in-bits='64' id='type-id-1308'/>
-    <qualified-type-def type-id='type-id-1309' const='yes' id='type-id-1310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1310' size-in-bits='64' id='type-id-1311'/>
-    <qualified-type-def type-id='type-id-1312' const='yes' id='type-id-1313'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1313' size-in-bits='64' id='type-id-1314'/>
-    <qualified-type-def type-id='type-id-1315' const='yes' id='type-id-1316'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1316' size-in-bits='64' id='type-id-1317'/>
-    <qualified-type-def type-id='type-id-1318' const='yes' id='type-id-1319'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1319' size-in-bits='64' id='type-id-1320'/>
+    <qualified-type-def type-id='type-id-1276' const='yes' id='type-id-1277'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1277' size-in-bits='64' id='type-id-1278'/>
+    <qualified-type-def type-id='type-id-1279' const='yes' id='type-id-1280'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1280' size-in-bits='64' id='type-id-1281'/>
+    <qualified-type-def type-id='type-id-1282' const='yes' id='type-id-1283'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1283' size-in-bits='64' id='type-id-1284'/>
+    <qualified-type-def type-id='type-id-1285' const='yes' id='type-id-1286'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1286' size-in-bits='64' id='type-id-1287'/>
+    <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1288'/>
+    <qualified-type-def type-id='type-id-1289' const='yes' id='type-id-1290'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1290' size-in-bits='64' id='type-id-1291'/>
+    <pointer-type-def type-id='type-id-1290' size-in-bits='64' id='type-id-1292'/>
+    <qualified-type-def type-id='type-id-1293' const='yes' id='type-id-1294'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1294' size-in-bits='64' id='type-id-1295'/>
+    <qualified-type-def type-id='type-id-1296' const='yes' id='type-id-1297'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1297' size-in-bits='64' id='type-id-1298'/>
+    <pointer-type-def type-id='type-id-1297' size-in-bits='64' id='type-id-1299'/>
+    <qualified-type-def type-id='type-id-1300' const='yes' id='type-id-1301'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1301' size-in-bits='64' id='type-id-1302'/>
+    <qualified-type-def type-id='type-id-1303' const='yes' id='type-id-1304'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1304' size-in-bits='64' id='type-id-1305'/>
+    <pointer-type-def type-id='type-id-1304' size-in-bits='64' id='type-id-1306'/>
+    <qualified-type-def type-id='type-id-1307' const='yes' id='type-id-1308'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1308' size-in-bits='64' id='type-id-1309'/>
+    <qualified-type-def type-id='type-id-1310' const='yes' id='type-id-1311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1311' size-in-bits='64' id='type-id-1312'/>
+    <pointer-type-def type-id='type-id-1311' size-in-bits='64' id='type-id-1313'/>
+    <qualified-type-def type-id='type-id-1314' const='yes' id='type-id-1315'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1315' size-in-bits='64' id='type-id-1316'/>
+    <qualified-type-def type-id='type-id-1317' const='yes' id='type-id-1318'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1318' size-in-bits='64' id='type-id-1319'/>
+    <pointer-type-def type-id='type-id-1318' size-in-bits='64' id='type-id-1320'/>
     <qualified-type-def type-id='type-id-1321' const='yes' id='type-id-1322'/>
     <reference-type-def kind='lvalue' type-id='type-id-1322' size-in-bits='64' id='type-id-1323'/>
-    <pointer-type-def type-id='type-id-1322' size-in-bits='64' id='type-id-1324'/>
-    <qualified-type-def type-id='type-id-94' const='yes' id='type-id-1325'/>
-    <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
-    <qualified-type-def type-id='type-id-57' const='yes' id='type-id-1327'/>
-    <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
-    <qualified-type-def type-id='type-id-1328' restrict='yes' id='type-id-1329'/>
-    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1330'/>
-    <qualified-type-def type-id='type-id-105' const='yes' id='type-id-36'/>
-    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-1331'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-1332'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1332' size-in-bits='64' id='type-id-1333'/>
-    <qualified-type-def type-id='type-id-91' const='yes' id='type-id-1334'/>
+    <qualified-type-def type-id='type-id-1324' const='yes' id='type-id-1325'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
+    <qualified-type-def type-id='type-id-1327' const='yes' id='type-id-1328'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1328' size-in-bits='64' id='type-id-1329'/>
+    <qualified-type-def type-id='type-id-1330' const='yes' id='type-id-1331'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
+    <qualified-type-def type-id='type-id-1333' const='yes' id='type-id-1334'/>
     <reference-type-def kind='lvalue' type-id='type-id-1334' size-in-bits='64' id='type-id-1335'/>
-    <qualified-type-def type-id='type-id-1336' const='yes' id='type-id-1337'/>
+    <pointer-type-def type-id='type-id-1334' size-in-bits='64' id='type-id-1336'/>
+    <qualified-type-def type-id='type-id-99' const='yes' id='type-id-1337'/>
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
-    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-1340'/>
-    <pointer-type-def type-id='type-id-1340' size-in-bits='64' id='type-id-1341'/>
-    <qualified-type-def type-id='type-id-1342' const='yes' id='type-id-1343'/>
-    <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
-    <qualified-type-def type-id='type-id-1345' const='yes' id='type-id-1346'/>
-    <pointer-type-def type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
+    <qualified-type-def type-id='type-id-62' const='yes' id='type-id-1339'/>
+    <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
+    <qualified-type-def type-id='type-id-1340' restrict='yes' id='type-id-1341'/>
+    <qualified-type-def type-id='type-id-101' const='yes' id='type-id-1342'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-36'/>
+    <reference-type-def kind='lvalue' type-id='type-id-37' size-in-bits='64' id='type-id-1343'/>
+    <qualified-type-def type-id='type-id-53' const='yes' id='type-id-1344'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1344' size-in-bits='64' id='type-id-1345'/>
+    <qualified-type-def type-id='type-id-96' const='yes' id='type-id-1346'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1346' size-in-bits='64' id='type-id-1347'/>
     <qualified-type-def type-id='type-id-1348' const='yes' id='type-id-1349'/>
     <pointer-type-def type-id='type-id-1349' size-in-bits='64' id='type-id-1350'/>
     <qualified-type-def type-id='type-id-1351' const='yes' id='type-id-1352'/>
@@ -2920,989 +2917,989 @@
     <qualified-type-def type-id='type-id-1381' const='yes' id='type-id-1382'/>
     <pointer-type-def type-id='type-id-1382' size-in-bits='64' id='type-id-1383'/>
     <qualified-type-def type-id='type-id-1384' const='yes' id='type-id-1385'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1385' size-in-bits='64' id='type-id-1386'/>
+    <pointer-type-def type-id='type-id-1385' size-in-bits='64' id='type-id-1386'/>
     <qualified-type-def type-id='type-id-1387' const='yes' id='type-id-1388'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1388' size-in-bits='64' id='type-id-1389'/>
+    <pointer-type-def type-id='type-id-1388' size-in-bits='64' id='type-id-1389'/>
     <qualified-type-def type-id='type-id-1390' const='yes' id='type-id-1391'/>
     <pointer-type-def type-id='type-id-1391' size-in-bits='64' id='type-id-1392'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-1393'/>
-    <pointer-type-def type-id='type-id-1393' size-in-bits='64' id='type-id-1394'/>
-    <qualified-type-def type-id='type-id-1394' restrict='yes' id='type-id-1395'/>
-    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-1396'/>
-    <qualified-type-def type-id='type-id-1396' restrict='yes' id='type-id-1397'/>
-    <reference-type-def kind='lvalue' type-id='type-id-38' size-in-bits='64' id='type-id-1398'/>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1399'/>
-    <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-1400'/>
-    <qualified-type-def type-id='type-id-1400' restrict='yes' id='type-id-1401'/>
-    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-64'/>
-    <reference-type-def kind='lvalue' type-id='type-id-40' size-in-bits='64' id='type-id-1403'/>
-    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-1404'/>
-    <reference-type-def kind='lvalue' type-id='type-id-43' size-in-bits='64' id='type-id-1405'/>
-    <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-1406'/>
+    <qualified-type-def type-id='type-id-1393' const='yes' id='type-id-1394'/>
+    <pointer-type-def type-id='type-id-1394' size-in-bits='64' id='type-id-1395'/>
+    <qualified-type-def type-id='type-id-1396' const='yes' id='type-id-1397'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1397' size-in-bits='64' id='type-id-1398'/>
+    <qualified-type-def type-id='type-id-1399' const='yes' id='type-id-1400'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1400' size-in-bits='64' id='type-id-1401'/>
+    <qualified-type-def type-id='type-id-1402' const='yes' id='type-id-1403'/>
+    <pointer-type-def type-id='type-id-1403' size-in-bits='64' id='type-id-1404'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-1405'/>
+    <pointer-type-def type-id='type-id-1405' size-in-bits='64' id='type-id-1406'/>
     <qualified-type-def type-id='type-id-1406' restrict='yes' id='type-id-1407'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-1408'/>
-    <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-1409'/>
-    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-1410'/>
-    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1411'/>
-    <reference-type-def kind='rvalue' type-id='type-id-297' size-in-bits='64' id='type-id-1412'/>
-    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-1413'/>
-    <reference-type-def kind='lvalue' type-id='type-id-301' size-in-bits='64' id='type-id-1414'/>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-1415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1416' size-in-bits='64' id='type-id-1417'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-1418'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-1419'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-1420'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-1421'/>
-    <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-1422'/>
-    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-1423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-1424'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-1425'/>
-    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-1426'/>
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-1427'/>
-    <reference-type-def kind='lvalue' type-id='type-id-333' size-in-bits='64' id='type-id-1428'/>
-    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-1429'/>
-    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-1430'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-1431'/>
-    <pointer-type-def type-id='type-id-1432' size-in-bits='64' id='type-id-1433'/>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-1434'/>
-    <pointer-type-def type-id='type-id-1435' size-in-bits='64' id='type-id-1436'/>
-    <reference-type-def kind='lvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1437'/>
-    <reference-type-def kind='rvalue' type-id='type-id-347' size-in-bits='64' id='type-id-1438'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-1439'/>
-    <reference-type-def kind='lvalue' type-id='type-id-351' size-in-bits='64' id='type-id-1440'/>
-    <pointer-type-def type-id='type-id-351' size-in-bits='64' id='type-id-1441'/>
-    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1442'/>
-    <reference-type-def kind='rvalue' type-id='type-id-354' size-in-bits='64' id='type-id-1443'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-1444'/>
-    <pointer-type-def type-id='type-id-1445' size-in-bits='64' id='type-id-1446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1447'/>
-    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-1448'/>
-    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-1449'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-1450'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-1451'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1452' size-in-bits='64' id='type-id-1453'/>
-    <reference-type-def kind='lvalue' type-id='type-id-368' size-in-bits='64' id='type-id-1454'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-1455'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-1456'/>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-1457'/>
+    <pointer-type-def type-id='type-id-1406' size-in-bits='64' id='type-id-1408'/>
+    <qualified-type-def type-id='type-id-1408' restrict='yes' id='type-id-1409'/>
+    <reference-type-def kind='lvalue' type-id='type-id-38' size-in-bits='64' id='type-id-1410'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1411'/>
+    <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-1412'/>
+    <qualified-type-def type-id='type-id-1412' restrict='yes' id='type-id-1413'/>
+    <pointer-type-def type-id='type-id-1414' size-in-bits='64' id='type-id-69'/>
+    <reference-type-def kind='lvalue' type-id='type-id-40' size-in-bits='64' id='type-id-1415'/>
+    <pointer-type-def type-id='type-id-40' size-in-bits='64' id='type-id-1416'/>
+    <reference-type-def kind='lvalue' type-id='type-id-45' size-in-bits='64' id='type-id-1417'/>
+    <pointer-type-def type-id='type-id-93' size-in-bits='64' id='type-id-1418'/>
+    <qualified-type-def type-id='type-id-1418' restrict='yes' id='type-id-1419'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-1420'/>
+    <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-1421'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1422'/>
+    <reference-type-def kind='lvalue' type-id='type-id-310' size-in-bits='64' id='type-id-1423'/>
+    <reference-type-def kind='rvalue' type-id='type-id-310' size-in-bits='64' id='type-id-1424'/>
+    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-1425'/>
+    <reference-type-def kind='lvalue' type-id='type-id-314' size-in-bits='64' id='type-id-1426'/>
+    <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-1427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1428' size-in-bits='64' id='type-id-1429'/>
+    <reference-type-def kind='lvalue' type-id='type-id-317' size-in-bits='64' id='type-id-1430'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-1431'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-1432'/>
+    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-1433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-327' size-in-bits='64' id='type-id-1434'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-1435'/>
+    <reference-type-def kind='lvalue' type-id='type-id-330' size-in-bits='64' id='type-id-1436'/>
+    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-1437'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-1438'/>
+    <pointer-type-def type-id='type-id-342' size-in-bits='64' id='type-id-1439'/>
+    <reference-type-def kind='lvalue' type-id='type-id-346' size-in-bits='64' id='type-id-1440'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-1441'/>
+    <reference-type-def kind='lvalue' type-id='type-id-350' size-in-bits='64' id='type-id-1442'/>
+    <pointer-type-def type-id='type-id-350' size-in-bits='64' id='type-id-1443'/>
+    <pointer-type-def type-id='type-id-1444' size-in-bits='64' id='type-id-1445'/>
+    <reference-type-def kind='rvalue' type-id='type-id-48' size-in-bits='64' id='type-id-1446'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-1447'/>
+    <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-1449'/>
+    <reference-type-def kind='lvalue' type-id='type-id-360' size-in-bits='64' id='type-id-1450'/>
+    <reference-type-def kind='rvalue' type-id='type-id-360' size-in-bits='64' id='type-id-1451'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-1452'/>
+    <reference-type-def kind='lvalue' type-id='type-id-364' size-in-bits='64' id='type-id-1453'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-1454'/>
+    <reference-type-def kind='lvalue' type-id='type-id-367' size-in-bits='64' id='type-id-1455'/>
+    <reference-type-def kind='rvalue' type-id='type-id-367' size-in-bits='64' id='type-id-1456'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-1457'/>
     <pointer-type-def type-id='type-id-1458' size-in-bits='64' id='type-id-1459'/>
-    <reference-type-def kind='lvalue' type-id='type-id-380' size-in-bits='64' id='type-id-1460'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-1461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1462'/>
-    <reference-type-def kind='rvalue' type-id='type-id-384' size-in-bits='64' id='type-id-1463'/>
-    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-1464'/>
-    <reference-type-def kind='lvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1465'/>
-    <reference-type-def kind='rvalue' type-id='type-id-388' size-in-bits='64' id='type-id-1466'/>
-    <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-1467'/>
-    <reference-type-def kind='lvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1468'/>
-    <reference-type-def kind='rvalue' type-id='type-id-392' size-in-bits='64' id='type-id-1469'/>
-    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-1470'/>
-    <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1471'/>
-    <reference-type-def kind='rvalue' type-id='type-id-398' size-in-bits='64' id='type-id-1472'/>
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-1473'/>
-    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1474'/>
-    <reference-type-def kind='rvalue' type-id='type-id-402' size-in-bits='64' id='type-id-1475'/>
-    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-1476'/>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-1477'/>
-    <reference-type-def kind='lvalue' type-id='type-id-412' size-in-bits='64' id='type-id-1478'/>
-    <pointer-type-def type-id='type-id-412' size-in-bits='64' id='type-id-1479'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-1480'/>
-    <pointer-type-def type-id='type-id-420' size-in-bits='64' id='type-id-1481'/>
-    <reference-type-def kind='lvalue' type-id='type-id-423' size-in-bits='64' id='type-id-1482'/>
-    <pointer-type-def type-id='type-id-423' size-in-bits='64' id='type-id-1483'/>
-    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-1484'/>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-1485'/>
-    <qualified-type-def type-id='type-id-1485' const='yes' id='type-id-1486'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1486' size-in-bits='64' id='type-id-1487'/>
-    <reference-type-def kind='lvalue' type-id='type-id-431' size-in-bits='64' id='type-id-1488'/>
-    <pointer-type-def type-id='type-id-431' size-in-bits='64' id='type-id-1489'/>
-    <pointer-type-def type-id='type-id-434' size-in-bits='64' id='type-id-1490'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1491' size-in-bits='64' id='type-id-1492'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1491' size-in-bits='64' id='type-id-1493'/>
-    <pointer-type-def type-id='type-id-1491' size-in-bits='64' id='type-id-1494'/>
-    <pointer-type-def type-id='type-id-1495' size-in-bits='64' id='type-id-1496'/>
-    <reference-type-def kind='lvalue' type-id='type-id-437' size-in-bits='64' id='type-id-1497'/>
-    <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-1498'/>
+    <reference-type-def kind='lvalue' type-id='type-id-371' size-in-bits='64' id='type-id-1460'/>
+    <reference-type-def kind='rvalue' type-id='type-id-371' size-in-bits='64' id='type-id-1461'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-1462'/>
+    <pointer-type-def type-id='type-id-375' size-in-bits='64' id='type-id-1463'/>
+    <pointer-type-def type-id='type-id-378' size-in-bits='64' id='type-id-1464'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1465' size-in-bits='64' id='type-id-1466'/>
+    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-1467'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-1468'/>
+    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-1469'/>
+    <pointer-type-def type-id='type-id-389' size-in-bits='64' id='type-id-1470'/>
+    <pointer-type-def type-id='type-id-1471' size-in-bits='64' id='type-id-1472'/>
+    <reference-type-def kind='lvalue' type-id='type-id-393' size-in-bits='64' id='type-id-1473'/>
+    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-1474'/>
+    <reference-type-def kind='lvalue' type-id='type-id-397' size-in-bits='64' id='type-id-1475'/>
+    <reference-type-def kind='rvalue' type-id='type-id-397' size-in-bits='64' id='type-id-1476'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-1477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-401' size-in-bits='64' id='type-id-1478'/>
+    <reference-type-def kind='rvalue' type-id='type-id-401' size-in-bits='64' id='type-id-1479'/>
+    <pointer-type-def type-id='type-id-401' size-in-bits='64' id='type-id-1480'/>
+    <reference-type-def kind='lvalue' type-id='type-id-405' size-in-bits='64' id='type-id-1481'/>
+    <reference-type-def kind='rvalue' type-id='type-id-405' size-in-bits='64' id='type-id-1482'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-1483'/>
+    <reference-type-def kind='lvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1484'/>
+    <reference-type-def kind='rvalue' type-id='type-id-411' size-in-bits='64' id='type-id-1485'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-1486'/>
+    <reference-type-def kind='lvalue' type-id='type-id-415' size-in-bits='64' id='type-id-1487'/>
+    <reference-type-def kind='rvalue' type-id='type-id-415' size-in-bits='64' id='type-id-1488'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-1489'/>
+    <pointer-type-def type-id='type-id-419' size-in-bits='64' id='type-id-1490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-425' size-in-bits='64' id='type-id-1491'/>
+    <pointer-type-def type-id='type-id-425' size-in-bits='64' id='type-id-1492'/>
+    <pointer-type-def type-id='type-id-429' size-in-bits='64' id='type-id-1493'/>
+    <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-1494'/>
+    <reference-type-def kind='lvalue' type-id='type-id-436' size-in-bits='64' id='type-id-1495'/>
+    <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-1496'/>
+    <reference-type-def kind='lvalue' type-id='type-id-440' size-in-bits='64' id='type-id-1497'/>
+    <pointer-type-def type-id='type-id-440' size-in-bits='64' id='type-id-1498'/>
     <qualified-type-def type-id='type-id-1498' const='yes' id='type-id-1499'/>
     <reference-type-def kind='lvalue' type-id='type-id-1499' size-in-bits='64' id='type-id-1500'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1501'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1498' size-in-bits='64' id='type-id-1502'/>
-    <pointer-type-def type-id='type-id-1503' size-in-bits='64' id='type-id-1504'/>
-    <reference-type-def kind='lvalue' type-id='type-id-441' size-in-bits='64' id='type-id-1505'/>
-    <pointer-type-def type-id='type-id-441' size-in-bits='64' id='type-id-1506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1507'/>
-    <reference-type-def kind='rvalue' type-id='type-id-445' size-in-bits='64' id='type-id-1508'/>
-    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-1509'/>
-    <pointer-type-def type-id='type-id-1510' size-in-bits='64' id='type-id-1511'/>
-    <pointer-type-def type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-449' size-in-bits='64' id='type-id-1514'/>
-    <pointer-type-def type-id='type-id-449' size-in-bits='64' id='type-id-1515'/>
-    <reference-type-def kind='lvalue' type-id='type-id-92' size-in-bits='64' id='type-id-1516'/>
-    <reference-type-def kind='lvalue' type-id='type-id-458' size-in-bits='64' id='type-id-1517'/>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-1518'/>
-    <reference-type-def kind='lvalue' type-id='type-id-462' size-in-bits='64' id='type-id-1519'/>
-    <reference-type-def kind='rvalue' type-id='type-id-462' size-in-bits='64' id='type-id-1520'/>
-    <pointer-type-def type-id='type-id-462' size-in-bits='64' id='type-id-1521'/>
-    <qualified-type-def type-id='type-id-1521' const='yes' id='type-id-1522'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1522' size-in-bits='64' id='type-id-1523'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1521' size-in-bits='64' id='type-id-1524'/>
-    <reference-type-def kind='lvalue' type-id='type-id-465' size-in-bits='64' id='type-id-1525'/>
-    <reference-type-def kind='rvalue' type-id='type-id-465' size-in-bits='64' id='type-id-1526'/>
-    <pointer-type-def type-id='type-id-465' size-in-bits='64' id='type-id-1527'/>
-    <qualified-type-def type-id='type-id-1527' const='yes' id='type-id-1528'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1528' size-in-bits='64' id='type-id-1529'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1527' size-in-bits='64' id='type-id-1530'/>
-    <reference-type-def kind='lvalue' type-id='type-id-468' size-in-bits='64' id='type-id-1531'/>
-    <reference-type-def kind='rvalue' type-id='type-id-468' size-in-bits='64' id='type-id-1532'/>
-    <pointer-type-def type-id='type-id-468' size-in-bits='64' id='type-id-1533'/>
-    <qualified-type-def type-id='type-id-1533' const='yes' id='type-id-1534'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1534' size-in-bits='64' id='type-id-1535'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1533' size-in-bits='64' id='type-id-1536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-471' size-in-bits='64' id='type-id-1537'/>
-    <reference-type-def kind='rvalue' type-id='type-id-471' size-in-bits='64' id='type-id-1538'/>
-    <pointer-type-def type-id='type-id-471' size-in-bits='64' id='type-id-1539'/>
-    <qualified-type-def type-id='type-id-1539' const='yes' id='type-id-1540'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1540' size-in-bits='64' id='type-id-1541'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1539' size-in-bits='64' id='type-id-1542'/>
-    <reference-type-def kind='lvalue' type-id='type-id-474' size-in-bits='64' id='type-id-1543'/>
-    <reference-type-def kind='rvalue' type-id='type-id-474' size-in-bits='64' id='type-id-1544'/>
-    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-1545'/>
-    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1546'/>
-    <reference-type-def kind='rvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1547'/>
-    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1548'/>
-    <reference-type-def kind='lvalue' type-id='type-id-480' size-in-bits='64' id='type-id-1549'/>
-    <reference-type-def kind='rvalue' type-id='type-id-480' size-in-bits='64' id='type-id-1550'/>
-    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-1551'/>
-    <qualified-type-def type-id='type-id-1551' const='yes' id='type-id-1552'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1553'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1551' size-in-bits='64' id='type-id-1554'/>
-    <reference-type-def kind='lvalue' type-id='type-id-483' size-in-bits='64' id='type-id-1555'/>
-    <reference-type-def kind='rvalue' type-id='type-id-483' size-in-bits='64' id='type-id-1556'/>
-    <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-1557'/>
-    <qualified-type-def type-id='type-id-1557' const='yes' id='type-id-1558'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1558' size-in-bits='64' id='type-id-1559'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1557' size-in-bits='64' id='type-id-1560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-486' size-in-bits='64' id='type-id-1561'/>
-    <reference-type-def kind='rvalue' type-id='type-id-486' size-in-bits='64' id='type-id-1562'/>
-    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-1563'/>
-    <qualified-type-def type-id='type-id-1563' const='yes' id='type-id-1564'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1563' size-in-bits='64' id='type-id-1566'/>
-    <reference-type-def kind='lvalue' type-id='type-id-489' size-in-bits='64' id='type-id-1567'/>
-    <reference-type-def kind='rvalue' type-id='type-id-489' size-in-bits='64' id='type-id-1568'/>
-    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-1569'/>
-    <qualified-type-def type-id='type-id-1569' const='yes' id='type-id-1570'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1569' size-in-bits='64' id='type-id-1572'/>
-    <reference-type-def kind='rvalue' type-id='type-id-492' size-in-bits='64' id='type-id-1573'/>
-    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1574'/>
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-1575'/>
-    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-1576'/>
-    <reference-type-def kind='rvalue' type-id='type-id-498' size-in-bits='64' id='type-id-1577'/>
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-1578'/>
-    <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-1580'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1581' size-in-bits='64' id='type-id-1582'/>
-    <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <reference-type-def kind='lvalue' type-id='type-id-511' size-in-bits='64' id='type-id-1585'/>
-    <reference-type-def kind='rvalue' type-id='type-id-511' size-in-bits='64' id='type-id-1586'/>
-    <pointer-type-def type-id='type-id-511' size-in-bits='64' id='type-id-1587'/>
-    <reference-type-def kind='lvalue' type-id='type-id-514' size-in-bits='64' id='type-id-1588'/>
-    <reference-type-def kind='rvalue' type-id='type-id-514' size-in-bits='64' id='type-id-1589'/>
-    <pointer-type-def type-id='type-id-514' size-in-bits='64' id='type-id-1590'/>
-    <reference-type-def kind='lvalue' type-id='type-id-517' size-in-bits='64' id='type-id-1591'/>
-    <reference-type-def kind='rvalue' type-id='type-id-517' size-in-bits='64' id='type-id-1592'/>
-    <pointer-type-def type-id='type-id-517' size-in-bits='64' id='type-id-1593'/>
-    <reference-type-def kind='lvalue' type-id='type-id-520' size-in-bits='64' id='type-id-1594'/>
-    <reference-type-def kind='rvalue' type-id='type-id-520' size-in-bits='64' id='type-id-1595'/>
-    <pointer-type-def type-id='type-id-520' size-in-bits='64' id='type-id-1596'/>
-    <reference-type-def kind='lvalue' type-id='type-id-523' size-in-bits='64' id='type-id-1597'/>
-    <reference-type-def kind='rvalue' type-id='type-id-523' size-in-bits='64' id='type-id-1598'/>
-    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-1599'/>
-    <reference-type-def kind='lvalue' type-id='type-id-526' size-in-bits='64' id='type-id-1600'/>
-    <reference-type-def kind='rvalue' type-id='type-id-526' size-in-bits='64' id='type-id-1601'/>
-    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-1602'/>
-    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1603'/>
-    <reference-type-def kind='rvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1604'/>
-    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-1605'/>
-    <reference-type-def kind='lvalue' type-id='type-id-532' size-in-bits='64' id='type-id-1606'/>
-    <reference-type-def kind='rvalue' type-id='type-id-532' size-in-bits='64' id='type-id-1607'/>
-    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-1608'/>
-    <reference-type-def kind='lvalue' type-id='type-id-535' size-in-bits='64' id='type-id-1609'/>
-    <reference-type-def kind='rvalue' type-id='type-id-535' size-in-bits='64' id='type-id-1610'/>
-    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-1611'/>
-    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1612'/>
-    <reference-type-def kind='rvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1613'/>
-    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1614'/>
-    <reference-type-def kind='lvalue' type-id='type-id-541' size-in-bits='64' id='type-id-1615'/>
-    <reference-type-def kind='rvalue' type-id='type-id-541' size-in-bits='64' id='type-id-1616'/>
-    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-1617'/>
-    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-1618'/>
-    <reference-type-def kind='rvalue' type-id='type-id-544' size-in-bits='64' id='type-id-1619'/>
-    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-1620'/>
-    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1621'/>
-    <reference-type-def kind='rvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1622'/>
-    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-1623'/>
-    <reference-type-def kind='lvalue' type-id='type-id-550' size-in-bits='64' id='type-id-1624'/>
-    <reference-type-def kind='rvalue' type-id='type-id-550' size-in-bits='64' id='type-id-1625'/>
-    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-1626'/>
-    <reference-type-def kind='lvalue' type-id='type-id-553' size-in-bits='64' id='type-id-1627'/>
-    <reference-type-def kind='rvalue' type-id='type-id-553' size-in-bits='64' id='type-id-1628'/>
-    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-1629'/>
-    <reference-type-def kind='lvalue' type-id='type-id-556' size-in-bits='64' id='type-id-1630'/>
-    <reference-type-def kind='rvalue' type-id='type-id-556' size-in-bits='64' id='type-id-1631'/>
-    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-1633'/>
-    <reference-type-def kind='rvalue' type-id='type-id-559' size-in-bits='64' id='type-id-1634'/>
-    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1635'/>
-    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-1636'/>
-    <reference-type-def kind='rvalue' type-id='type-id-562' size-in-bits='64' id='type-id-1637'/>
-    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-1638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-1639'/>
-    <reference-type-def kind='rvalue' type-id='type-id-565' size-in-bits='64' id='type-id-1640'/>
-    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-1641'/>
-    <reference-type-def kind='lvalue' type-id='type-id-568' size-in-bits='64' id='type-id-1642'/>
-    <reference-type-def kind='rvalue' type-id='type-id-568' size-in-bits='64' id='type-id-1643'/>
-    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-1644'/>
-    <reference-type-def kind='lvalue' type-id='type-id-571' size-in-bits='64' id='type-id-1645'/>
-    <reference-type-def kind='rvalue' type-id='type-id-571' size-in-bits='64' id='type-id-1646'/>
-    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-1647'/>
-    <reference-type-def kind='lvalue' type-id='type-id-574' size-in-bits='64' id='type-id-1648'/>
-    <reference-type-def kind='rvalue' type-id='type-id-574' size-in-bits='64' id='type-id-1649'/>
-    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-1650'/>
-    <reference-type-def kind='lvalue' type-id='type-id-577' size-in-bits='64' id='type-id-1651'/>
-    <reference-type-def kind='rvalue' type-id='type-id-577' size-in-bits='64' id='type-id-1652'/>
-    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-1653'/>
-    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-1654'/>
-    <reference-type-def kind='rvalue' type-id='type-id-580' size-in-bits='64' id='type-id-1655'/>
-    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-1656'/>
-    <reference-type-def kind='lvalue' type-id='type-id-583' size-in-bits='64' id='type-id-1657'/>
-    <reference-type-def kind='rvalue' type-id='type-id-583' size-in-bits='64' id='type-id-1658'/>
-    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-1659'/>
-    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-1660'/>
-    <reference-type-def kind='rvalue' type-id='type-id-586' size-in-bits='64' id='type-id-1661'/>
-    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-1662'/>
-    <reference-type-def kind='lvalue' type-id='type-id-589' size-in-bits='64' id='type-id-1663'/>
-    <reference-type-def kind='rvalue' type-id='type-id-589' size-in-bits='64' id='type-id-1664'/>
-    <pointer-type-def type-id='type-id-589' size-in-bits='64' id='type-id-1665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-592' size-in-bits='64' id='type-id-1666'/>
-    <reference-type-def kind='rvalue' type-id='type-id-592' size-in-bits='64' id='type-id-1667'/>
-    <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-1668'/>
-    <reference-type-def kind='lvalue' type-id='type-id-595' size-in-bits='64' id='type-id-1669'/>
-    <reference-type-def kind='rvalue' type-id='type-id-595' size-in-bits='64' id='type-id-1670'/>
-    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-1671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-1672'/>
-    <reference-type-def kind='rvalue' type-id='type-id-598' size-in-bits='64' id='type-id-1673'/>
-    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1674'/>
-    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-1675'/>
-    <reference-type-def kind='rvalue' type-id='type-id-601' size-in-bits='64' id='type-id-1676'/>
-    <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-1677'/>
-    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1678'/>
-    <reference-type-def kind='rvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1679'/>
-    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-1680'/>
-    <reference-type-def kind='lvalue' type-id='type-id-607' size-in-bits='64' id='type-id-1681'/>
-    <reference-type-def kind='rvalue' type-id='type-id-607' size-in-bits='64' id='type-id-1682'/>
-    <pointer-type-def type-id='type-id-607' size-in-bits='64' id='type-id-1683'/>
-    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1684'/>
-    <reference-type-def kind='rvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1685'/>
-    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-1686'/>
-    <reference-type-def kind='rvalue' type-id='type-id-613' size-in-bits='64' id='type-id-1687'/>
-    <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-1688'/>
-    <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1690'/>
+    <reference-type-def kind='lvalue' type-id='type-id-444' size-in-bits='64' id='type-id-1501'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-1502'/>
+    <pointer-type-def type-id='type-id-447' size-in-bits='64' id='type-id-1503'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1505'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1504' size-in-bits='64' id='type-id-1506'/>
+    <pointer-type-def type-id='type-id-1504' size-in-bits='64' id='type-id-1507'/>
+    <pointer-type-def type-id='type-id-1508' size-in-bits='64' id='type-id-1509'/>
+    <reference-type-def kind='lvalue' type-id='type-id-118' size-in-bits='64' id='type-id-1510'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-1511'/>
+    <qualified-type-def type-id='type-id-1511' const='yes' id='type-id-1512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1512' size-in-bits='64' id='type-id-1513'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1514'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1511' size-in-bits='64' id='type-id-1515'/>
+    <pointer-type-def type-id='type-id-1516' size-in-bits='64' id='type-id-1517'/>
+    <reference-type-def kind='lvalue' type-id='type-id-453' size-in-bits='64' id='type-id-1518'/>
+    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-1519'/>
+    <reference-type-def kind='lvalue' type-id='type-id-457' size-in-bits='64' id='type-id-1520'/>
+    <reference-type-def kind='rvalue' type-id='type-id-457' size-in-bits='64' id='type-id-1521'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-1522'/>
+    <pointer-type-def type-id='type-id-1523' size-in-bits='64' id='type-id-1524'/>
+    <pointer-type-def type-id='type-id-1525' size-in-bits='64' id='type-id-1526'/>
+    <reference-type-def kind='lvalue' type-id='type-id-461' size-in-bits='64' id='type-id-1527'/>
+    <pointer-type-def type-id='type-id-461' size-in-bits='64' id='type-id-1528'/>
+    <reference-type-def kind='lvalue' type-id='type-id-97' size-in-bits='64' id='type-id-1529'/>
+    <reference-type-def kind='lvalue' type-id='type-id-470' size-in-bits='64' id='type-id-1530'/>
+    <pointer-type-def type-id='type-id-470' size-in-bits='64' id='type-id-1531'/>
+    <reference-type-def kind='lvalue' type-id='type-id-474' size-in-bits='64' id='type-id-1532'/>
+    <reference-type-def kind='rvalue' type-id='type-id-474' size-in-bits='64' id='type-id-1533'/>
+    <pointer-type-def type-id='type-id-474' size-in-bits='64' id='type-id-1534'/>
+    <qualified-type-def type-id='type-id-1534' const='yes' id='type-id-1535'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1535' size-in-bits='64' id='type-id-1536'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1534' size-in-bits='64' id='type-id-1537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1538'/>
+    <reference-type-def kind='rvalue' type-id='type-id-477' size-in-bits='64' id='type-id-1539'/>
+    <pointer-type-def type-id='type-id-477' size-in-bits='64' id='type-id-1540'/>
+    <qualified-type-def type-id='type-id-1540' const='yes' id='type-id-1541'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1541' size-in-bits='64' id='type-id-1542'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1540' size-in-bits='64' id='type-id-1543'/>
+    <reference-type-def kind='lvalue' type-id='type-id-480' size-in-bits='64' id='type-id-1544'/>
+    <reference-type-def kind='rvalue' type-id='type-id-480' size-in-bits='64' id='type-id-1545'/>
+    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-1546'/>
+    <qualified-type-def type-id='type-id-1546' const='yes' id='type-id-1547'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1547' size-in-bits='64' id='type-id-1548'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1546' size-in-bits='64' id='type-id-1549'/>
+    <reference-type-def kind='lvalue' type-id='type-id-483' size-in-bits='64' id='type-id-1550'/>
+    <reference-type-def kind='rvalue' type-id='type-id-483' size-in-bits='64' id='type-id-1551'/>
+    <pointer-type-def type-id='type-id-483' size-in-bits='64' id='type-id-1552'/>
+    <qualified-type-def type-id='type-id-1552' const='yes' id='type-id-1553'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1553' size-in-bits='64' id='type-id-1554'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1552' size-in-bits='64' id='type-id-1555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-486' size-in-bits='64' id='type-id-1556'/>
+    <reference-type-def kind='rvalue' type-id='type-id-486' size-in-bits='64' id='type-id-1557'/>
+    <pointer-type-def type-id='type-id-486' size-in-bits='64' id='type-id-1558'/>
+    <reference-type-def kind='lvalue' type-id='type-id-489' size-in-bits='64' id='type-id-1559'/>
+    <reference-type-def kind='rvalue' type-id='type-id-489' size-in-bits='64' id='type-id-1560'/>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-1561'/>
+    <reference-type-def kind='lvalue' type-id='type-id-492' size-in-bits='64' id='type-id-1562'/>
+    <reference-type-def kind='rvalue' type-id='type-id-492' size-in-bits='64' id='type-id-1563'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-1564'/>
+    <qualified-type-def type-id='type-id-1564' const='yes' id='type-id-1565'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1565' size-in-bits='64' id='type-id-1566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1564' size-in-bits='64' id='type-id-1567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-495' size-in-bits='64' id='type-id-1568'/>
+    <reference-type-def kind='rvalue' type-id='type-id-495' size-in-bits='64' id='type-id-1569'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-1570'/>
+    <qualified-type-def type-id='type-id-1570' const='yes' id='type-id-1571'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1571' size-in-bits='64' id='type-id-1572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-1574'/>
+    <reference-type-def kind='rvalue' type-id='type-id-498' size-in-bits='64' id='type-id-1575'/>
+    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-1576'/>
+    <qualified-type-def type-id='type-id-1576' const='yes' id='type-id-1577'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1577' size-in-bits='64' id='type-id-1578'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1576' size-in-bits='64' id='type-id-1579'/>
+    <reference-type-def kind='lvalue' type-id='type-id-501' size-in-bits='64' id='type-id-1580'/>
+    <reference-type-def kind='rvalue' type-id='type-id-501' size-in-bits='64' id='type-id-1581'/>
+    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-1582'/>
+    <qualified-type-def type-id='type-id-1582' const='yes' id='type-id-1583'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1582' size-in-bits='64' id='type-id-1585'/>
+    <reference-type-def kind='rvalue' type-id='type-id-504' size-in-bits='64' id='type-id-1586'/>
+    <pointer-type-def type-id='type-id-504' size-in-bits='64' id='type-id-1587'/>
+    <pointer-type-def type-id='type-id-507' size-in-bits='64' id='type-id-1588'/>
+    <reference-type-def kind='lvalue' type-id='type-id-510' size-in-bits='64' id='type-id-1589'/>
+    <reference-type-def kind='rvalue' type-id='type-id-510' size-in-bits='64' id='type-id-1590'/>
+    <pointer-type-def type-id='type-id-510' size-in-bits='64' id='type-id-1591'/>
+    <pointer-type-def type-id='type-id-1592' size-in-bits='64' id='type-id-1593'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1594' size-in-bits='64' id='type-id-1595'/>
+    <pointer-type-def type-id='type-id-1596' size-in-bits='64' id='type-id-1597'/>
+    <reference-type-def kind='lvalue' type-id='type-id-523' size-in-bits='64' id='type-id-1598'/>
+    <reference-type-def kind='rvalue' type-id='type-id-523' size-in-bits='64' id='type-id-1599'/>
+    <pointer-type-def type-id='type-id-523' size-in-bits='64' id='type-id-1600'/>
+    <reference-type-def kind='lvalue' type-id='type-id-526' size-in-bits='64' id='type-id-1601'/>
+    <reference-type-def kind='rvalue' type-id='type-id-526' size-in-bits='64' id='type-id-1602'/>
+    <pointer-type-def type-id='type-id-526' size-in-bits='64' id='type-id-1603'/>
+    <reference-type-def kind='lvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1604'/>
+    <reference-type-def kind='rvalue' type-id='type-id-529' size-in-bits='64' id='type-id-1605'/>
+    <pointer-type-def type-id='type-id-529' size-in-bits='64' id='type-id-1606'/>
+    <reference-type-def kind='lvalue' type-id='type-id-532' size-in-bits='64' id='type-id-1607'/>
+    <reference-type-def kind='rvalue' type-id='type-id-532' size-in-bits='64' id='type-id-1608'/>
+    <pointer-type-def type-id='type-id-532' size-in-bits='64' id='type-id-1609'/>
+    <reference-type-def kind='lvalue' type-id='type-id-535' size-in-bits='64' id='type-id-1610'/>
+    <reference-type-def kind='rvalue' type-id='type-id-535' size-in-bits='64' id='type-id-1611'/>
+    <pointer-type-def type-id='type-id-535' size-in-bits='64' id='type-id-1612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1613'/>
+    <reference-type-def kind='rvalue' type-id='type-id-538' size-in-bits='64' id='type-id-1614'/>
+    <pointer-type-def type-id='type-id-538' size-in-bits='64' id='type-id-1615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-541' size-in-bits='64' id='type-id-1616'/>
+    <reference-type-def kind='rvalue' type-id='type-id-541' size-in-bits='64' id='type-id-1617'/>
+    <pointer-type-def type-id='type-id-541' size-in-bits='64' id='type-id-1618'/>
+    <reference-type-def kind='lvalue' type-id='type-id-544' size-in-bits='64' id='type-id-1619'/>
+    <reference-type-def kind='rvalue' type-id='type-id-544' size-in-bits='64' id='type-id-1620'/>
+    <pointer-type-def type-id='type-id-544' size-in-bits='64' id='type-id-1621'/>
+    <reference-type-def kind='lvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1622'/>
+    <reference-type-def kind='rvalue' type-id='type-id-547' size-in-bits='64' id='type-id-1623'/>
+    <pointer-type-def type-id='type-id-547' size-in-bits='64' id='type-id-1624'/>
+    <reference-type-def kind='lvalue' type-id='type-id-550' size-in-bits='64' id='type-id-1625'/>
+    <reference-type-def kind='rvalue' type-id='type-id-550' size-in-bits='64' id='type-id-1626'/>
+    <pointer-type-def type-id='type-id-550' size-in-bits='64' id='type-id-1627'/>
+    <reference-type-def kind='lvalue' type-id='type-id-553' size-in-bits='64' id='type-id-1628'/>
+    <reference-type-def kind='rvalue' type-id='type-id-553' size-in-bits='64' id='type-id-1629'/>
+    <pointer-type-def type-id='type-id-553' size-in-bits='64' id='type-id-1630'/>
+    <reference-type-def kind='lvalue' type-id='type-id-556' size-in-bits='64' id='type-id-1631'/>
+    <reference-type-def kind='rvalue' type-id='type-id-556' size-in-bits='64' id='type-id-1632'/>
+    <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-1633'/>
+    <reference-type-def kind='lvalue' type-id='type-id-559' size-in-bits='64' id='type-id-1634'/>
+    <reference-type-def kind='rvalue' type-id='type-id-559' size-in-bits='64' id='type-id-1635'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-1636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-562' size-in-bits='64' id='type-id-1637'/>
+    <reference-type-def kind='rvalue' type-id='type-id-562' size-in-bits='64' id='type-id-1638'/>
+    <pointer-type-def type-id='type-id-562' size-in-bits='64' id='type-id-1639'/>
+    <reference-type-def kind='lvalue' type-id='type-id-565' size-in-bits='64' id='type-id-1640'/>
+    <reference-type-def kind='rvalue' type-id='type-id-565' size-in-bits='64' id='type-id-1641'/>
+    <pointer-type-def type-id='type-id-565' size-in-bits='64' id='type-id-1642'/>
+    <reference-type-def kind='lvalue' type-id='type-id-568' size-in-bits='64' id='type-id-1643'/>
+    <reference-type-def kind='rvalue' type-id='type-id-568' size-in-bits='64' id='type-id-1644'/>
+    <pointer-type-def type-id='type-id-568' size-in-bits='64' id='type-id-1645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-571' size-in-bits='64' id='type-id-1646'/>
+    <reference-type-def kind='rvalue' type-id='type-id-571' size-in-bits='64' id='type-id-1647'/>
+    <pointer-type-def type-id='type-id-571' size-in-bits='64' id='type-id-1648'/>
+    <reference-type-def kind='lvalue' type-id='type-id-574' size-in-bits='64' id='type-id-1649'/>
+    <reference-type-def kind='rvalue' type-id='type-id-574' size-in-bits='64' id='type-id-1650'/>
+    <pointer-type-def type-id='type-id-574' size-in-bits='64' id='type-id-1651'/>
+    <reference-type-def kind='lvalue' type-id='type-id-577' size-in-bits='64' id='type-id-1652'/>
+    <reference-type-def kind='rvalue' type-id='type-id-577' size-in-bits='64' id='type-id-1653'/>
+    <pointer-type-def type-id='type-id-577' size-in-bits='64' id='type-id-1654'/>
+    <reference-type-def kind='lvalue' type-id='type-id-580' size-in-bits='64' id='type-id-1655'/>
+    <reference-type-def kind='rvalue' type-id='type-id-580' size-in-bits='64' id='type-id-1656'/>
+    <pointer-type-def type-id='type-id-580' size-in-bits='64' id='type-id-1657'/>
+    <reference-type-def kind='lvalue' type-id='type-id-583' size-in-bits='64' id='type-id-1658'/>
+    <reference-type-def kind='rvalue' type-id='type-id-583' size-in-bits='64' id='type-id-1659'/>
+    <pointer-type-def type-id='type-id-583' size-in-bits='64' id='type-id-1660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-586' size-in-bits='64' id='type-id-1661'/>
+    <reference-type-def kind='rvalue' type-id='type-id-586' size-in-bits='64' id='type-id-1662'/>
+    <pointer-type-def type-id='type-id-586' size-in-bits='64' id='type-id-1663'/>
+    <reference-type-def kind='lvalue' type-id='type-id-589' size-in-bits='64' id='type-id-1664'/>
+    <reference-type-def kind='rvalue' type-id='type-id-589' size-in-bits='64' id='type-id-1665'/>
+    <pointer-type-def type-id='type-id-589' size-in-bits='64' id='type-id-1666'/>
+    <reference-type-def kind='lvalue' type-id='type-id-592' size-in-bits='64' id='type-id-1667'/>
+    <reference-type-def kind='rvalue' type-id='type-id-592' size-in-bits='64' id='type-id-1668'/>
+    <pointer-type-def type-id='type-id-592' size-in-bits='64' id='type-id-1669'/>
+    <reference-type-def kind='lvalue' type-id='type-id-595' size-in-bits='64' id='type-id-1670'/>
+    <reference-type-def kind='rvalue' type-id='type-id-595' size-in-bits='64' id='type-id-1671'/>
+    <pointer-type-def type-id='type-id-595' size-in-bits='64' id='type-id-1672'/>
+    <reference-type-def kind='lvalue' type-id='type-id-598' size-in-bits='64' id='type-id-1673'/>
+    <reference-type-def kind='rvalue' type-id='type-id-598' size-in-bits='64' id='type-id-1674'/>
+    <pointer-type-def type-id='type-id-598' size-in-bits='64' id='type-id-1675'/>
+    <reference-type-def kind='lvalue' type-id='type-id-601' size-in-bits='64' id='type-id-1676'/>
+    <reference-type-def kind='rvalue' type-id='type-id-601' size-in-bits='64' id='type-id-1677'/>
+    <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-1678'/>
+    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1679'/>
+    <reference-type-def kind='rvalue' type-id='type-id-604' size-in-bits='64' id='type-id-1680'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-1681'/>
+    <reference-type-def kind='lvalue' type-id='type-id-607' size-in-bits='64' id='type-id-1682'/>
+    <reference-type-def kind='rvalue' type-id='type-id-607' size-in-bits='64' id='type-id-1683'/>
+    <pointer-type-def type-id='type-id-607' size-in-bits='64' id='type-id-1684'/>
+    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1685'/>
+    <reference-type-def kind='rvalue' type-id='type-id-610' size-in-bits='64' id='type-id-1686'/>
+    <pointer-type-def type-id='type-id-610' size-in-bits='64' id='type-id-1687'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-1688'/>
+    <reference-type-def kind='rvalue' type-id='type-id-613' size-in-bits='64' id='type-id-1689'/>
+    <pointer-type-def type-id='type-id-613' size-in-bits='64' id='type-id-1690'/>
     <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-1691'/>
     <reference-type-def kind='rvalue' type-id='type-id-616' size-in-bits='64' id='type-id-1692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-619' size-in-bits='64' id='type-id-1693'/>
-    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-1694'/>
-    <pointer-type-def type-id='type-id-1695' size-in-bits='64' id='type-id-1696'/>
+    <pointer-type-def type-id='type-id-616' size-in-bits='64' id='type-id-1693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-619' size-in-bits='64' id='type-id-1694'/>
+    <reference-type-def kind='rvalue' type-id='type-id-619' size-in-bits='64' id='type-id-1695'/>
+    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-1696'/>
     <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-1697'/>
     <reference-type-def kind='rvalue' type-id='type-id-622' size-in-bits='64' id='type-id-1698'/>
-    <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-1699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-629' size-in-bits='64' id='type-id-1700'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-1701'/>
-    <reference-type-def kind='lvalue' type-id='type-id-639' size-in-bits='64' id='type-id-1702'/>
-    <reference-type-def kind='lvalue' type-id='type-id-645' size-in-bits='64' id='type-id-1703'/>
-    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-1704'/>
-    <reference-type-def kind='lvalue' type-id='type-id-648' size-in-bits='64' id='type-id-1705'/>
-    <pointer-type-def type-id='type-id-651' size-in-bits='64' id='type-id-1706'/>
-    <reference-type-def kind='lvalue' type-id='type-id-654' size-in-bits='64' id='type-id-1707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1708'/>
-    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-1709'/>
-    <reference-type-def kind='lvalue' type-id='type-id-661' size-in-bits='64' id='type-id-1710'/>
-    <pointer-type-def type-id='type-id-661' size-in-bits='64' id='type-id-1711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-665' size-in-bits='64' id='type-id-1712'/>
-    <reference-type-def kind='rvalue' type-id='type-id-665' size-in-bits='64' id='type-id-1713'/>
-    <pointer-type-def type-id='type-id-665' size-in-bits='64' id='type-id-1714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1715'/>
-    <reference-type-def kind='rvalue' type-id='type-id-668' size-in-bits='64' id='type-id-1716'/>
-    <pointer-type-def type-id='type-id-668' size-in-bits='64' id='type-id-1717'/>
-    <reference-type-def kind='lvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1718'/>
-    <reference-type-def kind='rvalue' type-id='type-id-671' size-in-bits='64' id='type-id-1719'/>
-    <pointer-type-def type-id='type-id-671' size-in-bits='64' id='type-id-1720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1721'/>
-    <reference-type-def kind='rvalue' type-id='type-id-674' size-in-bits='64' id='type-id-1722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1723'/>
-    <reference-type-def kind='rvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1724'/>
-    <reference-type-def kind='lvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1725'/>
-    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-1726'/>
-    <reference-type-def kind='lvalue' type-id='type-id-684' size-in-bits='64' id='type-id-1727'/>
-    <pointer-type-def type-id='type-id-684' size-in-bits='64' id='type-id-1728'/>
-    <reference-type-def kind='lvalue' type-id='type-id-687' size-in-bits='64' id='type-id-1729'/>
-    <pointer-type-def type-id='type-id-687' size-in-bits='64' id='type-id-1730'/>
-    <pointer-type-def type-id='type-id-1731' size-in-bits='64' id='type-id-1732'/>
-    <reference-type-def kind='lvalue' type-id='type-id-691' size-in-bits='64' id='type-id-1733'/>
-    <pointer-type-def type-id='type-id-691' size-in-bits='64' id='type-id-1734'/>
-    <pointer-type-def type-id='type-id-1735' size-in-bits='64' id='type-id-1736'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1737' size-in-bits='64' id='type-id-1738'/>
-    <pointer-type-def type-id='type-id-1737' size-in-bits='64' id='type-id-1739'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1740' size-in-bits='64' id='type-id-1741'/>
-    <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1742'/>
-    <reference-type-def kind='lvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1743'/>
-    <reference-type-def kind='rvalue' type-id='type-id-695' size-in-bits='64' id='type-id-1744'/>
-    <pointer-type-def type-id='type-id-695' size-in-bits='64' id='type-id-1745'/>
-    <reference-type-def kind='lvalue' type-id='type-id-698' size-in-bits='64' id='type-id-1746'/>
-    <reference-type-def kind='lvalue' type-id='type-id-701' size-in-bits='64' id='type-id-1747'/>
-    <reference-type-def kind='rvalue' type-id='type-id-701' size-in-bits='64' id='type-id-1748'/>
-    <pointer-type-def type-id='type-id-701' size-in-bits='64' id='type-id-1749'/>
-    <reference-type-def kind='lvalue' type-id='type-id-704' size-in-bits='64' id='type-id-1750'/>
-    <reference-type-def kind='rvalue' type-id='type-id-704' size-in-bits='64' id='type-id-1751'/>
-    <pointer-type-def type-id='type-id-704' size-in-bits='64' id='type-id-1752'/>
-    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1753'/>
-    <reference-type-def kind='rvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1754'/>
-    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-1755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1756'/>
-    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1757'/>
-    <reference-type-def kind='rvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1758'/>
-    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-1759'/>
-    <reference-type-def kind='lvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1760'/>
-    <reference-type-def kind='lvalue' type-id='type-id-719' size-in-bits='64' id='type-id-1761'/>
-    <reference-type-def kind='rvalue' type-id='type-id-719' size-in-bits='64' id='type-id-1762'/>
-    <pointer-type-def type-id='type-id-719' size-in-bits='64' id='type-id-1763'/>
-    <reference-type-def kind='lvalue' type-id='type-id-722' size-in-bits='64' id='type-id-1764'/>
-    <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1765'/>
-    <reference-type-def kind='rvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1766'/>
-    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1767'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-1768'/>
-    <reference-type-def kind='rvalue' type-id='type-id-728' size-in-bits='64' id='type-id-1769'/>
-    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-1770'/>
-    <reference-type-def kind='lvalue' type-id='type-id-731' size-in-bits='64' id='type-id-1771'/>
-    <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-1772'/>
-    <reference-type-def kind='rvalue' type-id='type-id-734' size-in-bits='64' id='type-id-1773'/>
-    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-1774'/>
-    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1775'/>
-    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1776'/>
-    <reference-type-def kind='rvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1777'/>
-    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-1778'/>
-    <reference-type-def kind='lvalue' type-id='type-id-743' size-in-bits='64' id='type-id-1779'/>
-    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1780'/>
-    <reference-type-def kind='rvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1781'/>
-    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-1782'/>
-    <reference-type-def kind='lvalue' type-id='type-id-749' size-in-bits='64' id='type-id-1783'/>
-    <reference-type-def kind='lvalue' type-id='type-id-752' size-in-bits='64' id='type-id-1784'/>
-    <reference-type-def kind='rvalue' type-id='type-id-752' size-in-bits='64' id='type-id-1785'/>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-1786'/>
-    <reference-type-def kind='lvalue' type-id='type-id-755' size-in-bits='64' id='type-id-1787'/>
-    <reference-type-def kind='rvalue' type-id='type-id-755' size-in-bits='64' id='type-id-1788'/>
-    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-1789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-758' size-in-bits='64' id='type-id-1790'/>
-    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-1791'/>
-    <reference-type-def kind='rvalue' type-id='type-id-761' size-in-bits='64' id='type-id-1792'/>
-    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-1793'/>
-    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-1794'/>
-    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1795'/>
-    <reference-type-def kind='rvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1796'/>
-    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1797'/>
-    <reference-type-def kind='lvalue' type-id='type-id-770' size-in-bits='64' id='type-id-1798'/>
-    <reference-type-def kind='lvalue' type-id='type-id-773' size-in-bits='64' id='type-id-1799'/>
-    <reference-type-def kind='rvalue' type-id='type-id-773' size-in-bits='64' id='type-id-1800'/>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-1801'/>
-    <reference-type-def kind='lvalue' type-id='type-id-776' size-in-bits='64' id='type-id-1802'/>
-    <reference-type-def kind='rvalue' type-id='type-id-776' size-in-bits='64' id='type-id-1803'/>
-    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-1804'/>
-    <reference-type-def kind='lvalue' type-id='type-id-779' size-in-bits='64' id='type-id-1805'/>
-    <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1806'/>
-    <reference-type-def kind='rvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1807'/>
-    <pointer-type-def type-id='type-id-782' size-in-bits='64' id='type-id-1808'/>
-    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-1809'/>
-    <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1810'/>
-    <reference-type-def kind='rvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1811'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-1812'/>
-    <reference-type-def kind='lvalue' type-id='type-id-791' size-in-bits='64' id='type-id-1813'/>
-    <reference-type-def kind='rvalue' type-id='type-id-791' size-in-bits='64' id='type-id-1814'/>
-    <pointer-type-def type-id='type-id-791' size-in-bits='64' id='type-id-1815'/>
-    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1816'/>
-    <reference-type-def kind='rvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1817'/>
-    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1818'/>
-    <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-1819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1820'/>
-    <reference-type-def kind='rvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1821'/>
-    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1822'/>
-    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1823'/>
-    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1824'/>
-    <reference-type-def kind='rvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1825'/>
-    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1826'/>
-    <reference-type-def kind='lvalue' type-id='type-id-809' size-in-bits='64' id='type-id-1827'/>
-    <reference-type-def kind='lvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1828'/>
-    <reference-type-def kind='rvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1829'/>
-    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-1830'/>
-    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1831'/>
-    <reference-type-def kind='lvalue' type-id='type-id-818' size-in-bits='64' id='type-id-1832'/>
-    <reference-type-def kind='rvalue' type-id='type-id-818' size-in-bits='64' id='type-id-1833'/>
-    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-1834'/>
-    <reference-type-def kind='lvalue' type-id='type-id-821' size-in-bits='64' id='type-id-1835'/>
-    <reference-type-def kind='rvalue' type-id='type-id-821' size-in-bits='64' id='type-id-1836'/>
-    <pointer-type-def type-id='type-id-821' size-in-bits='64' id='type-id-1837'/>
-    <reference-type-def kind='lvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1838'/>
-    <reference-type-def kind='rvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1839'/>
-    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-1840'/>
-    <reference-type-def kind='lvalue' type-id='type-id-827' size-in-bits='64' id='type-id-1841'/>
-    <reference-type-def kind='rvalue' type-id='type-id-827' size-in-bits='64' id='type-id-1842'/>
-    <pointer-type-def type-id='type-id-827' size-in-bits='64' id='type-id-1843'/>
-    <reference-type-def kind='lvalue' type-id='type-id-830' size-in-bits='64' id='type-id-1844'/>
-    <reference-type-def kind='lvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1845'/>
-    <reference-type-def kind='rvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1846'/>
-    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1847'/>
-    <reference-type-def kind='lvalue' type-id='type-id-836' size-in-bits='64' id='type-id-1848'/>
-    <reference-type-def kind='lvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1849'/>
-    <reference-type-def kind='rvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1850'/>
-    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1851'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1852' size-in-bits='64' id='type-id-1853'/>
-    <pointer-type-def type-id='type-id-1852' size-in-bits='64' id='type-id-1854'/>
-    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1855'/>
-    <reference-type-def kind='rvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1856'/>
-    <pointer-type-def type-id='type-id-842' size-in-bits='64' id='type-id-1857'/>
+    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-1699'/>
+    <reference-type-def kind='rvalue' type-id='type-id-625' size-in-bits='64' id='type-id-1700'/>
+    <pointer-type-def type-id='type-id-625' size-in-bits='64' id='type-id-1701'/>
+    <pointer-type-def type-id='type-id-1702' size-in-bits='64' id='type-id-1703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1704'/>
+    <reference-type-def kind='rvalue' type-id='type-id-628' size-in-bits='64' id='type-id-1705'/>
+    <reference-type-def kind='rvalue' type-id='type-id-631' size-in-bits='64' id='type-id-1706'/>
+    <pointer-type-def type-id='type-id-631' size-in-bits='64' id='type-id-1707'/>
+    <pointer-type-def type-id='type-id-1708' size-in-bits='64' id='type-id-1709'/>
+    <reference-type-def kind='lvalue' type-id='type-id-634' size-in-bits='64' id='type-id-1710'/>
+    <reference-type-def kind='rvalue' type-id='type-id-634' size-in-bits='64' id='type-id-1711'/>
+    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-1712'/>
+    <reference-type-def kind='lvalue' type-id='type-id-641' size-in-bits='64' id='type-id-1713'/>
+    <pointer-type-def type-id='type-id-647' size-in-bits='64' id='type-id-1714'/>
+    <reference-type-def kind='lvalue' type-id='type-id-651' size-in-bits='64' id='type-id-1715'/>
+    <reference-type-def kind='lvalue' type-id='type-id-657' size-in-bits='64' id='type-id-1716'/>
+    <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-1717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-660' size-in-bits='64' id='type-id-1718'/>
+    <pointer-type-def type-id='type-id-663' size-in-bits='64' id='type-id-1719'/>
+    <reference-type-def kind='lvalue' type-id='type-id-666' size-in-bits='64' id='type-id-1720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-669' size-in-bits='64' id='type-id-1721'/>
+    <pointer-type-def type-id='type-id-669' size-in-bits='64' id='type-id-1722'/>
+    <reference-type-def kind='lvalue' type-id='type-id-673' size-in-bits='64' id='type-id-1723'/>
+    <pointer-type-def type-id='type-id-673' size-in-bits='64' id='type-id-1724'/>
+    <reference-type-def kind='lvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1725'/>
+    <reference-type-def kind='rvalue' type-id='type-id-677' size-in-bits='64' id='type-id-1726'/>
+    <pointer-type-def type-id='type-id-677' size-in-bits='64' id='type-id-1727'/>
+    <reference-type-def kind='lvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1728'/>
+    <reference-type-def kind='rvalue' type-id='type-id-680' size-in-bits='64' id='type-id-1729'/>
+    <pointer-type-def type-id='type-id-680' size-in-bits='64' id='type-id-1730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1731'/>
+    <reference-type-def kind='rvalue' type-id='type-id-683' size-in-bits='64' id='type-id-1732'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-1733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-686' size-in-bits='64' id='type-id-1734'/>
+    <reference-type-def kind='rvalue' type-id='type-id-686' size-in-bits='64' id='type-id-1735'/>
+    <reference-type-def kind='lvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1736'/>
+    <reference-type-def kind='rvalue' type-id='type-id-689' size-in-bits='64' id='type-id-1737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-692' size-in-bits='64' id='type-id-1738'/>
+    <pointer-type-def type-id='type-id-692' size-in-bits='64' id='type-id-1739'/>
+    <reference-type-def kind='lvalue' type-id='type-id-696' size-in-bits='64' id='type-id-1740'/>
+    <pointer-type-def type-id='type-id-696' size-in-bits='64' id='type-id-1741'/>
+    <reference-type-def kind='lvalue' type-id='type-id-699' size-in-bits='64' id='type-id-1742'/>
+    <pointer-type-def type-id='type-id-699' size-in-bits='64' id='type-id-1743'/>
+    <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-1745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-703' size-in-bits='64' id='type-id-1746'/>
+    <pointer-type-def type-id='type-id-703' size-in-bits='64' id='type-id-1747'/>
+    <pointer-type-def type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
+    <pointer-type-def type-id='type-id-1750' size-in-bits='64' id='type-id-1752'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1753' size-in-bits='64' id='type-id-1754'/>
+    <pointer-type-def type-id='type-id-1753' size-in-bits='64' id='type-id-1755'/>
+    <reference-type-def kind='lvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1756'/>
+    <reference-type-def kind='rvalue' type-id='type-id-707' size-in-bits='64' id='type-id-1757'/>
+    <pointer-type-def type-id='type-id-707' size-in-bits='64' id='type-id-1758'/>
+    <reference-type-def kind='lvalue' type-id='type-id-710' size-in-bits='64' id='type-id-1759'/>
+    <reference-type-def kind='lvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1760'/>
+    <reference-type-def kind='rvalue' type-id='type-id-713' size-in-bits='64' id='type-id-1761'/>
+    <pointer-type-def type-id='type-id-713' size-in-bits='64' id='type-id-1762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1763'/>
+    <reference-type-def kind='rvalue' type-id='type-id-716' size-in-bits='64' id='type-id-1764'/>
+    <pointer-type-def type-id='type-id-716' size-in-bits='64' id='type-id-1765'/>
+    <reference-type-def kind='lvalue' type-id='type-id-719' size-in-bits='64' id='type-id-1766'/>
+    <reference-type-def kind='rvalue' type-id='type-id-719' size-in-bits='64' id='type-id-1767'/>
+    <pointer-type-def type-id='type-id-719' size-in-bits='64' id='type-id-1768'/>
+    <reference-type-def kind='lvalue' type-id='type-id-722' size-in-bits='64' id='type-id-1769'/>
+    <reference-type-def kind='lvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1770'/>
+    <reference-type-def kind='rvalue' type-id='type-id-725' size-in-bits='64' id='type-id-1771'/>
+    <pointer-type-def type-id='type-id-725' size-in-bits='64' id='type-id-1772'/>
+    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-1773'/>
+    <reference-type-def kind='lvalue' type-id='type-id-731' size-in-bits='64' id='type-id-1774'/>
+    <reference-type-def kind='rvalue' type-id='type-id-731' size-in-bits='64' id='type-id-1775'/>
+    <pointer-type-def type-id='type-id-731' size-in-bits='64' id='type-id-1776'/>
+    <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-1777'/>
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1778'/>
+    <reference-type-def kind='rvalue' type-id='type-id-737' size-in-bits='64' id='type-id-1779'/>
+    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-1780'/>
+    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1781'/>
+    <reference-type-def kind='rvalue' type-id='type-id-740' size-in-bits='64' id='type-id-1782'/>
+    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-1783'/>
+    <reference-type-def kind='lvalue' type-id='type-id-743' size-in-bits='64' id='type-id-1784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1785'/>
+    <reference-type-def kind='rvalue' type-id='type-id-746' size-in-bits='64' id='type-id-1786'/>
+    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-1787'/>
+    <reference-type-def kind='lvalue' type-id='type-id-749' size-in-bits='64' id='type-id-1788'/>
+    <reference-type-def kind='lvalue' type-id='type-id-752' size-in-bits='64' id='type-id-1789'/>
+    <reference-type-def kind='rvalue' type-id='type-id-752' size-in-bits='64' id='type-id-1790'/>
+    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-1791'/>
+    <reference-type-def kind='lvalue' type-id='type-id-755' size-in-bits='64' id='type-id-1792'/>
+    <reference-type-def kind='lvalue' type-id='type-id-758' size-in-bits='64' id='type-id-1793'/>
+    <reference-type-def kind='rvalue' type-id='type-id-758' size-in-bits='64' id='type-id-1794'/>
+    <pointer-type-def type-id='type-id-758' size-in-bits='64' id='type-id-1795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-1796'/>
+    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-1797'/>
+    <reference-type-def kind='rvalue' type-id='type-id-764' size-in-bits='64' id='type-id-1798'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-1799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1800'/>
+    <reference-type-def kind='rvalue' type-id='type-id-767' size-in-bits='64' id='type-id-1801'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-1802'/>
+    <reference-type-def kind='lvalue' type-id='type-id-770' size-in-bits='64' id='type-id-1803'/>
+    <reference-type-def kind='lvalue' type-id='type-id-773' size-in-bits='64' id='type-id-1804'/>
+    <reference-type-def kind='rvalue' type-id='type-id-773' size-in-bits='64' id='type-id-1805'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-1806'/>
+    <reference-type-def kind='lvalue' type-id='type-id-776' size-in-bits='64' id='type-id-1807'/>
+    <reference-type-def kind='lvalue' type-id='type-id-779' size-in-bits='64' id='type-id-1808'/>
+    <reference-type-def kind='rvalue' type-id='type-id-779' size-in-bits='64' id='type-id-1809'/>
+    <pointer-type-def type-id='type-id-779' size-in-bits='64' id='type-id-1810'/>
+    <reference-type-def kind='lvalue' type-id='type-id-782' size-in-bits='64' id='type-id-1811'/>
+    <reference-type-def kind='lvalue' type-id='type-id-785' size-in-bits='64' id='type-id-1812'/>
+    <reference-type-def kind='rvalue' type-id='type-id-785' size-in-bits='64' id='type-id-1813'/>
+    <pointer-type-def type-id='type-id-785' size-in-bits='64' id='type-id-1814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1815'/>
+    <reference-type-def kind='rvalue' type-id='type-id-788' size-in-bits='64' id='type-id-1816'/>
+    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-1817'/>
+    <reference-type-def kind='lvalue' type-id='type-id-791' size-in-bits='64' id='type-id-1818'/>
+    <reference-type-def kind='lvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1819'/>
+    <reference-type-def kind='rvalue' type-id='type-id-794' size-in-bits='64' id='type-id-1820'/>
+    <pointer-type-def type-id='type-id-794' size-in-bits='64' id='type-id-1821'/>
+    <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-1822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1823'/>
+    <reference-type-def kind='rvalue' type-id='type-id-800' size-in-bits='64' id='type-id-1824'/>
+    <pointer-type-def type-id='type-id-800' size-in-bits='64' id='type-id-1825'/>
+    <reference-type-def kind='lvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1826'/>
+    <reference-type-def kind='rvalue' type-id='type-id-803' size-in-bits='64' id='type-id-1827'/>
+    <pointer-type-def type-id='type-id-803' size-in-bits='64' id='type-id-1828'/>
+    <reference-type-def kind='lvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1829'/>
+    <reference-type-def kind='rvalue' type-id='type-id-806' size-in-bits='64' id='type-id-1830'/>
+    <pointer-type-def type-id='type-id-806' size-in-bits='64' id='type-id-1831'/>
+    <reference-type-def kind='lvalue' type-id='type-id-809' size-in-bits='64' id='type-id-1832'/>
+    <reference-type-def kind='lvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1833'/>
+    <reference-type-def kind='rvalue' type-id='type-id-812' size-in-bits='64' id='type-id-1834'/>
+    <pointer-type-def type-id='type-id-812' size-in-bits='64' id='type-id-1835'/>
+    <reference-type-def kind='lvalue' type-id='type-id-815' size-in-bits='64' id='type-id-1836'/>
+    <reference-type-def kind='lvalue' type-id='type-id-818' size-in-bits='64' id='type-id-1837'/>
+    <reference-type-def kind='rvalue' type-id='type-id-818' size-in-bits='64' id='type-id-1838'/>
+    <pointer-type-def type-id='type-id-818' size-in-bits='64' id='type-id-1839'/>
+    <reference-type-def kind='lvalue' type-id='type-id-821' size-in-bits='64' id='type-id-1840'/>
+    <reference-type-def kind='lvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1841'/>
+    <reference-type-def kind='rvalue' type-id='type-id-824' size-in-bits='64' id='type-id-1842'/>
+    <pointer-type-def type-id='type-id-824' size-in-bits='64' id='type-id-1843'/>
+    <reference-type-def kind='lvalue' type-id='type-id-827' size-in-bits='64' id='type-id-1844'/>
+    <reference-type-def kind='lvalue' type-id='type-id-830' size-in-bits='64' id='type-id-1845'/>
+    <reference-type-def kind='rvalue' type-id='type-id-830' size-in-bits='64' id='type-id-1846'/>
+    <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-1847'/>
+    <reference-type-def kind='lvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1848'/>
+    <reference-type-def kind='rvalue' type-id='type-id-833' size-in-bits='64' id='type-id-1849'/>
+    <pointer-type-def type-id='type-id-833' size-in-bits='64' id='type-id-1850'/>
+    <reference-type-def kind='lvalue' type-id='type-id-836' size-in-bits='64' id='type-id-1851'/>
+    <reference-type-def kind='rvalue' type-id='type-id-836' size-in-bits='64' id='type-id-1852'/>
+    <pointer-type-def type-id='type-id-836' size-in-bits='64' id='type-id-1853'/>
+    <reference-type-def kind='lvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1854'/>
+    <reference-type-def kind='rvalue' type-id='type-id-839' size-in-bits='64' id='type-id-1855'/>
+    <pointer-type-def type-id='type-id-839' size-in-bits='64' id='type-id-1856'/>
+    <reference-type-def kind='lvalue' type-id='type-id-842' size-in-bits='64' id='type-id-1857'/>
     <reference-type-def kind='lvalue' type-id='type-id-845' size-in-bits='64' id='type-id-1858'/>
-    <reference-type-def kind='lvalue' type-id='type-id-848' size-in-bits='64' id='type-id-1859'/>
-    <reference-type-def kind='rvalue' type-id='type-id-848' size-in-bits='64' id='type-id-1860'/>
-    <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-1861'/>
+    <reference-type-def kind='rvalue' type-id='type-id-845' size-in-bits='64' id='type-id-1859'/>
+    <pointer-type-def type-id='type-id-845' size-in-bits='64' id='type-id-1860'/>
+    <reference-type-def kind='lvalue' type-id='type-id-848' size-in-bits='64' id='type-id-1861'/>
     <reference-type-def kind='lvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1862'/>
-    <reference-type-def kind='lvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1863'/>
-    <reference-type-def kind='rvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1864'/>
-    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-1865'/>
-    <reference-type-def kind='lvalue' type-id='type-id-857' size-in-bits='64' id='type-id-1866'/>
-    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1867'/>
-    <reference-type-def kind='rvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1868'/>
-    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1869'/>
-    <reference-type-def kind='lvalue' type-id='type-id-863' size-in-bits='64' id='type-id-1870'/>
-    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1871'/>
-    <reference-type-def kind='rvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1872'/>
-    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1873'/>
-    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1875' size-in-bits='64' id='type-id-1876'/>
-    <pointer-type-def type-id='type-id-1875' size-in-bits='64' id='type-id-1877'/>
-    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1878'/>
-    <reference-type-def kind='rvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1879'/>
-    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-1880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-1881'/>
-    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1882'/>
-    <reference-type-def kind='rvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1883'/>
-    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-1884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-881' size-in-bits='64' id='type-id-1885'/>
-    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1886'/>
-    <reference-type-def kind='rvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1887'/>
-    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-1888'/>
-    <reference-type-def kind='lvalue' type-id='type-id-887' size-in-bits='64' id='type-id-1889'/>
-    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1890'/>
-    <reference-type-def kind='rvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1891'/>
-    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1892'/>
-    <reference-type-def kind='lvalue' type-id='type-id-893' size-in-bits='64' id='type-id-1893'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1894' size-in-bits='64' id='type-id-1895'/>
-    <pointer-type-def type-id='type-id-1894' size-in-bits='64' id='type-id-1896'/>
-    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1897'/>
-    <reference-type-def kind='rvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1898'/>
-    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-1899'/>
-    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-1900'/>
-    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1901'/>
-    <reference-type-def kind='rvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1902'/>
-    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1903'/>
-    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1904'/>
-    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1905'/>
-    <reference-type-def kind='rvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1906'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1907'/>
-    <reference-type-def kind='lvalue' type-id='type-id-911' size-in-bits='64' id='type-id-1908'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1909' size-in-bits='64' id='type-id-1910'/>
-    <pointer-type-def type-id='type-id-1909' size-in-bits='64' id='type-id-1911'/>
-    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1912'/>
-    <reference-type-def kind='rvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1913'/>
-    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1914'/>
-    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1915'/>
-    <reference-type-def kind='rvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1916'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-1917'/>
+    <reference-type-def kind='rvalue' type-id='type-id-851' size-in-bits='64' id='type-id-1863'/>
+    <pointer-type-def type-id='type-id-851' size-in-bits='64' id='type-id-1864'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1865' size-in-bits='64' id='type-id-1866'/>
+    <pointer-type-def type-id='type-id-1865' size-in-bits='64' id='type-id-1867'/>
+    <reference-type-def kind='lvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1868'/>
+    <reference-type-def kind='rvalue' type-id='type-id-854' size-in-bits='64' id='type-id-1869'/>
+    <pointer-type-def type-id='type-id-854' size-in-bits='64' id='type-id-1870'/>
+    <reference-type-def kind='lvalue' type-id='type-id-857' size-in-bits='64' id='type-id-1871'/>
+    <reference-type-def kind='lvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1872'/>
+    <reference-type-def kind='rvalue' type-id='type-id-860' size-in-bits='64' id='type-id-1873'/>
+    <pointer-type-def type-id='type-id-860' size-in-bits='64' id='type-id-1874'/>
+    <reference-type-def kind='lvalue' type-id='type-id-863' size-in-bits='64' id='type-id-1875'/>
+    <reference-type-def kind='lvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1876'/>
+    <reference-type-def kind='rvalue' type-id='type-id-866' size-in-bits='64' id='type-id-1877'/>
+    <pointer-type-def type-id='type-id-866' size-in-bits='64' id='type-id-1878'/>
+    <reference-type-def kind='lvalue' type-id='type-id-869' size-in-bits='64' id='type-id-1879'/>
+    <reference-type-def kind='lvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1880'/>
+    <reference-type-def kind='rvalue' type-id='type-id-872' size-in-bits='64' id='type-id-1881'/>
+    <pointer-type-def type-id='type-id-872' size-in-bits='64' id='type-id-1882'/>
+    <reference-type-def kind='lvalue' type-id='type-id-875' size-in-bits='64' id='type-id-1883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1884'/>
+    <reference-type-def kind='rvalue' type-id='type-id-878' size-in-bits='64' id='type-id-1885'/>
+    <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-1886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-881' size-in-bits='64' id='type-id-1887'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1888' size-in-bits='64' id='type-id-1889'/>
+    <pointer-type-def type-id='type-id-1888' size-in-bits='64' id='type-id-1890'/>
+    <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1891'/>
+    <reference-type-def kind='rvalue' type-id='type-id-884' size-in-bits='64' id='type-id-1892'/>
+    <pointer-type-def type-id='type-id-884' size-in-bits='64' id='type-id-1893'/>
+    <reference-type-def kind='lvalue' type-id='type-id-887' size-in-bits='64' id='type-id-1894'/>
+    <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1895'/>
+    <reference-type-def kind='rvalue' type-id='type-id-890' size-in-bits='64' id='type-id-1896'/>
+    <pointer-type-def type-id='type-id-890' size-in-bits='64' id='type-id-1897'/>
+    <reference-type-def kind='lvalue' type-id='type-id-893' size-in-bits='64' id='type-id-1898'/>
+    <reference-type-def kind='lvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1899'/>
+    <reference-type-def kind='rvalue' type-id='type-id-896' size-in-bits='64' id='type-id-1900'/>
+    <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-1901'/>
+    <reference-type-def kind='lvalue' type-id='type-id-899' size-in-bits='64' id='type-id-1902'/>
+    <reference-type-def kind='lvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1903'/>
+    <reference-type-def kind='rvalue' type-id='type-id-902' size-in-bits='64' id='type-id-1904'/>
+    <pointer-type-def type-id='type-id-902' size-in-bits='64' id='type-id-1905'/>
+    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-1906'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1907' size-in-bits='64' id='type-id-1908'/>
+    <pointer-type-def type-id='type-id-1907' size-in-bits='64' id='type-id-1909'/>
+    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1910'/>
+    <reference-type-def kind='rvalue' type-id='type-id-908' size-in-bits='64' id='type-id-1911'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-1912'/>
+    <reference-type-def kind='lvalue' type-id='type-id-911' size-in-bits='64' id='type-id-1913'/>
+    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1914'/>
+    <reference-type-def kind='rvalue' type-id='type-id-914' size-in-bits='64' id='type-id-1915'/>
+    <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-1916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-917' size-in-bits='64' id='type-id-1917'/>
     <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1918'/>
     <reference-type-def kind='rvalue' type-id='type-id-920' size-in-bits='64' id='type-id-1919'/>
     <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-1920'/>
     <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-1921'/>
     <reference-type-def kind='lvalue' type-id='type-id-1922' size-in-bits='64' id='type-id-1923'/>
     <pointer-type-def type-id='type-id-1922' size-in-bits='64' id='type-id-1924'/>
-    <reference-type-def kind='rvalue' type-id='type-id-926' size-in-bits='64' id='type-id-1925'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-1926'/>
-    <reference-type-def kind='lvalue' type-id='type-id-929' size-in-bits='64' id='type-id-1927'/>
-    <reference-type-def kind='rvalue' type-id='type-id-929' size-in-bits='64' id='type-id-1928'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1929' size-in-bits='64' id='type-id-1930'/>
-    <pointer-type-def type-id='type-id-1929' size-in-bits='64' id='type-id-1931'/>
-    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1932'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-1933'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1934' size-in-bits='64' id='type-id-1935'/>
-    <reference-type-def kind='lvalue' type-id='type-id-945' size-in-bits='64' id='type-id-1936'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-1937'/>
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1938'/>
-    <reference-type-def kind='lvalue' type-id='type-id-951' size-in-bits='64' id='type-id-1939'/>
-    <pointer-type-def type-id='type-id-951' size-in-bits='64' id='type-id-1940'/>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-1941'/>
-    <pointer-type-def type-id='type-id-955' size-in-bits='64' id='type-id-1942'/>
-    <reference-type-def kind='rvalue' type-id='type-id-958' size-in-bits='64' id='type-id-1943'/>
-    <pointer-type-def type-id='type-id-958' size-in-bits='64' id='type-id-1944'/>
-    <reference-type-def kind='lvalue' type-id='type-id-962' size-in-bits='64' id='type-id-1945'/>
-    <pointer-type-def type-id='type-id-1946' size-in-bits='64' id='type-id-1947'/>
-    <reference-type-def kind='lvalue' type-id='type-id-965' size-in-bits='64' id='type-id-1948'/>
-    <pointer-type-def type-id='type-id-965' size-in-bits='64' id='type-id-1949'/>
-    <pointer-type-def type-id='type-id-1950' size-in-bits='64' id='type-id-1951'/>
-    <reference-type-def kind='lvalue' type-id='type-id-968' size-in-bits='64' id='type-id-1952'/>
-    <pointer-type-def type-id='type-id-968' size-in-bits='64' id='type-id-1953'/>
-    <reference-type-def kind='lvalue' type-id='type-id-971' size-in-bits='64' id='type-id-1954'/>
-    <pointer-type-def type-id='type-id-971' size-in-bits='64' id='type-id-1955'/>
-    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-1956'/>
-    <pointer-type-def type-id='type-id-974' size-in-bits='64' id='type-id-1957'/>
-    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-1958'/>
-    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-1959'/>
-    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-1960'/>
-    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1961'/>
-    <pointer-type-def type-id='type-id-1962' size-in-bits='64' id='type-id-1963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-942' size-in-bits='64' id='type-id-1964'/>
-    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-1965'/>
-    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-1966'/>
-    <qualified-type-def type-id='type-id-1966' const='yes' id='type-id-1967'/>
-    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-1968'/>
-    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-1969'/>
-    <reference-type-def kind='lvalue' type-id='type-id-995' size-in-bits='64' id='type-id-1970'/>
-    <pointer-type-def type-id='type-id-999' size-in-bits='64' id='type-id-1971'/>
-    <pointer-type-def type-id='type-id-1003' size-in-bits='64' id='type-id-1972'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1006' size-in-bits='64' id='type-id-1973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1009' size-in-bits='64' id='type-id-1974'/>
-    <pointer-type-def type-id='type-id-1009' size-in-bits='64' id='type-id-1975'/>
-    <pointer-type-def type-id='type-id-1976' size-in-bits='64' id='type-id-1977'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1978' size-in-bits='64' id='type-id-1979'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1980' size-in-bits='64' id='type-id-1981'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1982' size-in-bits='64' id='type-id-1983'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1984' size-in-bits='64' id='type-id-1985'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1012' size-in-bits='64' id='type-id-1986'/>
-    <pointer-type-def type-id='type-id-1012' size-in-bits='64' id='type-id-1987'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1988'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1016' size-in-bits='64' id='type-id-1989'/>
-    <pointer-type-def type-id='type-id-1016' size-in-bits='64' id='type-id-1990'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1020' size-in-bits='64' id='type-id-1991'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1020' size-in-bits='64' id='type-id-1992'/>
-    <pointer-type-def type-id='type-id-1020' size-in-bits='64' id='type-id-1993'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1994'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1995'/>
-    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-1996'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-1997'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-1998'/>
-    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-1999'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-2000'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-2001'/>
-    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-2002'/>
-    <pointer-type-def type-id='type-id-2003' size-in-bits='64' id='type-id-2004'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1036' size-in-bits='64' id='type-id-2005'/>
-    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-2006'/>
-    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-2007'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1043' size-in-bits='64' id='type-id-2008'/>
-    <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-2009'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1046' size-in-bits='64' id='type-id-2010'/>
-    <pointer-type-def type-id='type-id-1046' size-in-bits='64' id='type-id-2011'/>
-    <pointer-type-def type-id='type-id-1050' size-in-bits='64' id='type-id-2012'/>
-    <pointer-type-def type-id='type-id-1053' size-in-bits='64' id='type-id-2013'/>
-    <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-2014'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1059' size-in-bits='64' id='type-id-2015'/>
-    <pointer-type-def type-id='type-id-1059' size-in-bits='64' id='type-id-2016'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1062' size-in-bits='64' id='type-id-2017'/>
-    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-2018'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1065' size-in-bits='64' id='type-id-2019'/>
-    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-2020'/>
-    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-2021'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-2022'/>
-    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-2023'/>
-    <pointer-type-def type-id='type-id-2024' size-in-bits='64' id='type-id-2025'/>
-    <pointer-type-def type-id='type-id-2026' size-in-bits='64' id='type-id-2027'/>
-    <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2029'/>
-    <pointer-type-def type-id='type-id-2030' size-in-bits='64' id='type-id-2031'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1075' size-in-bits='64' id='type-id-2032'/>
-    <pointer-type-def type-id='type-id-1075' size-in-bits='64' id='type-id-2033'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-2034'/>
-    <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-2035'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-2036'/>
-    <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-2037'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1092' size-in-bits='64' id='type-id-2038'/>
-    <pointer-type-def type-id='type-id-1092' size-in-bits='64' id='type-id-2039'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-2040'/>
-    <pointer-type-def type-id='type-id-1096' size-in-bits='64' id='type-id-2041'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1102' size-in-bits='64' id='type-id-2042'/>
-    <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-2043'/>
-    <pointer-type-def type-id='type-id-2044' size-in-bits='64' id='type-id-2045'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1105' size-in-bits='64' id='type-id-2046'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1105' size-in-bits='64' id='type-id-2047'/>
-    <pointer-type-def type-id='type-id-1105' size-in-bits='64' id='type-id-2048'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1109' size-in-bits='64' id='type-id-2049'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1109' size-in-bits='64' id='type-id-2050'/>
-    <pointer-type-def type-id='type-id-1109' size-in-bits='64' id='type-id-2051'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1113' size-in-bits='64' id='type-id-2052'/>
-    <pointer-type-def type-id='type-id-1113' size-in-bits='64' id='type-id-2053'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1117' size-in-bits='64' id='type-id-2054'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1117' size-in-bits='64' id='type-id-2055'/>
-    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-2056'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1121' size-in-bits='64' id='type-id-2057'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-2058'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-2059'/>
-    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-2060'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1129' size-in-bits='64' id='type-id-2061'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1129' size-in-bits='64' id='type-id-2062'/>
-    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-2063'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2064'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2065'/>
-    <pointer-type-def type-id='type-id-1133' size-in-bits='64' id='type-id-2066'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-2067'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-2068'/>
-    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-2069'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-2070'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-2071'/>
-    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-2072'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1145' size-in-bits='64' id='type-id-2073'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1145' size-in-bits='64' id='type-id-2074'/>
-    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-2075'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1149' size-in-bits='64' id='type-id-2076'/>
-    <pointer-type-def type-id='type-id-2077' size-in-bits='64' id='type-id-2078'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-2079'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1159' size-in-bits='64' id='type-id-2080'/>
-    <pointer-type-def type-id='type-id-1159' size-in-bits='64' id='type-id-2081'/>
-    <pointer-type-def type-id='type-id-2082' size-in-bits='64' id='type-id-2083'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1166' size-in-bits='64' id='type-id-2084'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-2085'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1169' size-in-bits='64' id='type-id-2086'/>
-    <pointer-type-def type-id='type-id-1169' size-in-bits='64' id='type-id-2087'/>
-    <qualified-type-def type-id='type-id-2087' const='yes' id='type-id-2088'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2088' size-in-bits='64' id='type-id-2089'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2087' size-in-bits='64' id='type-id-2090'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2087' size-in-bits='64' id='type-id-2091'/>
-    <pointer-type-def type-id='type-id-2092' size-in-bits='64' id='type-id-2093'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1176' size-in-bits='64' id='type-id-2094'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1179' size-in-bits='64' id='type-id-2095'/>
-    <pointer-type-def type-id='type-id-1179' size-in-bits='64' id='type-id-2096'/>
-    <qualified-type-def type-id='type-id-2096' const='yes' id='type-id-2097'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2097' size-in-bits='64' id='type-id-2098'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2096' size-in-bits='64' id='type-id-2099'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1182' size-in-bits='64' id='type-id-2100'/>
-    <pointer-type-def type-id='type-id-1182' size-in-bits='64' id='type-id-2101'/>
-    <qualified-type-def type-id='type-id-2101' const='yes' id='type-id-2102'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2102' size-in-bits='64' id='type-id-2103'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2101' size-in-bits='64' id='type-id-2104'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2101' size-in-bits='64' id='type-id-2105'/>
-    <pointer-type-def type-id='type-id-2106' size-in-bits='64' id='type-id-2107'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-2108'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1185' size-in-bits='64' id='type-id-2109'/>
-    <pointer-type-def type-id='type-id-1185' size-in-bits='64' id='type-id-2110'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-2111'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-2112'/>
-    <pointer-type-def type-id='type-id-1188' size-in-bits='64' id='type-id-2113'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-2114'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1192' size-in-bits='64' id='type-id-2115'/>
-    <pointer-type-def type-id='type-id-1192' size-in-bits='64' id='type-id-2116'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2117' size-in-bits='64' id='type-id-2118'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2119' size-in-bits='64' id='type-id-2120'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2121' size-in-bits='64' id='type-id-2122'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2123' size-in-bits='64' id='type-id-2124'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2125' size-in-bits='64' id='type-id-2126'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2127' size-in-bits='64' id='type-id-2128'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2129' size-in-bits='64' id='type-id-2130'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2131' size-in-bits='64' id='type-id-2132'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2133' size-in-bits='64' id='type-id-2134'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2135' size-in-bits='64' id='type-id-2136'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2137' size-in-bits='64' id='type-id-2138'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2139' size-in-bits='64' id='type-id-2140'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2141' size-in-bits='64' id='type-id-2142'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2143' size-in-bits='64' id='type-id-2144'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2143' size-in-bits='64' id='type-id-2145'/>
+    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-1925'/>
+    <reference-type-def kind='rvalue' type-id='type-id-926' size-in-bits='64' id='type-id-1926'/>
+    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-1927'/>
+    <reference-type-def kind='lvalue' type-id='type-id-929' size-in-bits='64' id='type-id-1928'/>
+    <reference-type-def kind='rvalue' type-id='type-id-929' size-in-bits='64' id='type-id-1929'/>
+    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-1930'/>
+    <reference-type-def kind='lvalue' type-id='type-id-932' size-in-bits='64' id='type-id-1931'/>
+    <reference-type-def kind='rvalue' type-id='type-id-932' size-in-bits='64' id='type-id-1932'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-1933'/>
+    <reference-type-def kind='lvalue' type-id='type-id-935' size-in-bits='64' id='type-id-1934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1935' size-in-bits='64' id='type-id-1936'/>
+    <pointer-type-def type-id='type-id-1935' size-in-bits='64' id='type-id-1937'/>
+    <reference-type-def kind='rvalue' type-id='type-id-938' size-in-bits='64' id='type-id-1938'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-1939'/>
+    <reference-type-def kind='lvalue' type-id='type-id-941' size-in-bits='64' id='type-id-1940'/>
+    <reference-type-def kind='rvalue' type-id='type-id-941' size-in-bits='64' id='type-id-1941'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1942' size-in-bits='64' id='type-id-1943'/>
+    <pointer-type-def type-id='type-id-1942' size-in-bits='64' id='type-id-1944'/>
+    <reference-type-def kind='lvalue' type-id='type-id-947' size-in-bits='64' id='type-id-1945'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-1946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1947' size-in-bits='64' id='type-id-1948'/>
+    <reference-type-def kind='lvalue' type-id='type-id-957' size-in-bits='64' id='type-id-1949'/>
+    <pointer-type-def type-id='type-id-957' size-in-bits='64' id='type-id-1950'/>
+    <pointer-type-def type-id='type-id-960' size-in-bits='64' id='type-id-1951'/>
+    <reference-type-def kind='lvalue' type-id='type-id-963' size-in-bits='64' id='type-id-1952'/>
+    <pointer-type-def type-id='type-id-963' size-in-bits='64' id='type-id-1953'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-1954'/>
+    <pointer-type-def type-id='type-id-967' size-in-bits='64' id='type-id-1955'/>
+    <reference-type-def kind='rvalue' type-id='type-id-970' size-in-bits='64' id='type-id-1956'/>
+    <pointer-type-def type-id='type-id-970' size-in-bits='64' id='type-id-1957'/>
+    <reference-type-def kind='lvalue' type-id='type-id-974' size-in-bits='64' id='type-id-1958'/>
+    <pointer-type-def type-id='type-id-1959' size-in-bits='64' id='type-id-1960'/>
+    <reference-type-def kind='lvalue' type-id='type-id-977' size-in-bits='64' id='type-id-1961'/>
+    <pointer-type-def type-id='type-id-977' size-in-bits='64' id='type-id-1962'/>
+    <pointer-type-def type-id='type-id-1963' size-in-bits='64' id='type-id-1964'/>
+    <reference-type-def kind='lvalue' type-id='type-id-980' size-in-bits='64' id='type-id-1965'/>
+    <pointer-type-def type-id='type-id-980' size-in-bits='64' id='type-id-1966'/>
+    <reference-type-def kind='lvalue' type-id='type-id-983' size-in-bits='64' id='type-id-1967'/>
+    <pointer-type-def type-id='type-id-983' size-in-bits='64' id='type-id-1968'/>
+    <reference-type-def kind='lvalue' type-id='type-id-986' size-in-bits='64' id='type-id-1969'/>
+    <pointer-type-def type-id='type-id-986' size-in-bits='64' id='type-id-1970'/>
+    <reference-type-def kind='lvalue' type-id='type-id-989' size-in-bits='64' id='type-id-1971'/>
+    <pointer-type-def type-id='type-id-989' size-in-bits='64' id='type-id-1972'/>
+    <reference-type-def kind='lvalue' type-id='type-id-992' size-in-bits='64' id='type-id-1973'/>
+    <pointer-type-def type-id='type-id-992' size-in-bits='64' id='type-id-1974'/>
+    <pointer-type-def type-id='type-id-1975' size-in-bits='64' id='type-id-1976'/>
+    <reference-type-def kind='lvalue' type-id='type-id-954' size-in-bits='64' id='type-id-1977'/>
+    <reference-type-def kind='lvalue' type-id='type-id-998' size-in-bits='64' id='type-id-1978'/>
+    <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-1979'/>
+    <qualified-type-def type-id='type-id-1979' const='yes' id='type-id-1980'/>
+    <pointer-type-def type-id='type-id-1001' size-in-bits='64' id='type-id-1981'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1004' size-in-bits='64' id='type-id-1982'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1007' size-in-bits='64' id='type-id-1983'/>
+    <pointer-type-def type-id='type-id-1011' size-in-bits='64' id='type-id-1984'/>
+    <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1985'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1018' size-in-bits='64' id='type-id-1986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1021' size-in-bits='64' id='type-id-1987'/>
+    <pointer-type-def type-id='type-id-1021' size-in-bits='64' id='type-id-1988'/>
+    <pointer-type-def type-id='type-id-1989' size-in-bits='64' id='type-id-1990'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1991' size-in-bits='64' id='type-id-1992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1993' size-in-bits='64' id='type-id-1994'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1995' size-in-bits='64' id='type-id-1996'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1997' size-in-bits='64' id='type-id-1998'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1024' size-in-bits='64' id='type-id-1999'/>
+    <pointer-type-def type-id='type-id-1024' size-in-bits='64' id='type-id-2000'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-2001'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1028' size-in-bits='64' id='type-id-2002'/>
+    <pointer-type-def type-id='type-id-1028' size-in-bits='64' id='type-id-2003'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-2004'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1032' size-in-bits='64' id='type-id-2005'/>
+    <pointer-type-def type-id='type-id-1032' size-in-bits='64' id='type-id-2006'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1036' size-in-bits='64' id='type-id-2007'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1036' size-in-bits='64' id='type-id-2008'/>
+    <pointer-type-def type-id='type-id-1036' size-in-bits='64' id='type-id-2009'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-2010'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-2011'/>
+    <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-2012'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-2013'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1044' size-in-bits='64' id='type-id-2014'/>
+    <pointer-type-def type-id='type-id-1044' size-in-bits='64' id='type-id-2015'/>
+    <pointer-type-def type-id='type-id-2016' size-in-bits='64' id='type-id-2017'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1048' size-in-bits='64' id='type-id-2018'/>
+    <pointer-type-def type-id='type-id-1048' size-in-bits='64' id='type-id-2019'/>
+    <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-2020'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1055' size-in-bits='64' id='type-id-2021'/>
+    <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-2022'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1058' size-in-bits='64' id='type-id-2023'/>
+    <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-2024'/>
+    <pointer-type-def type-id='type-id-1062' size-in-bits='64' id='type-id-2025'/>
+    <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-2026'/>
+    <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-2027'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1071' size-in-bits='64' id='type-id-2028'/>
+    <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-2029'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1074' size-in-bits='64' id='type-id-2030'/>
+    <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-2031'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1077' size-in-bits='64' id='type-id-2032'/>
+    <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-2033'/>
+    <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-2034'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-2035'/>
+    <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-2036'/>
+    <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2038'/>
+    <pointer-type-def type-id='type-id-2039' size-in-bits='64' id='type-id-2040'/>
+    <pointer-type-def type-id='type-id-2041' size-in-bits='64' id='type-id-2042'/>
+    <pointer-type-def type-id='type-id-2043' size-in-bits='64' id='type-id-2044'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-2045'/>
+    <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-2046'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-2047'/>
+    <pointer-type-def type-id='type-id-1093' size-in-bits='64' id='type-id-2048'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-2049'/>
+    <pointer-type-def type-id='type-id-1097' size-in-bits='64' id='type-id-2050'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-2051'/>
+    <pointer-type-def type-id='type-id-1104' size-in-bits='64' id='type-id-2052'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1108' size-in-bits='64' id='type-id-2053'/>
+    <pointer-type-def type-id='type-id-1108' size-in-bits='64' id='type-id-2054'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1114' size-in-bits='64' id='type-id-2055'/>
+    <pointer-type-def type-id='type-id-1114' size-in-bits='64' id='type-id-2056'/>
+    <pointer-type-def type-id='type-id-2057' size-in-bits='64' id='type-id-2058'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1117' size-in-bits='64' id='type-id-2059'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1117' size-in-bits='64' id='type-id-2060'/>
+    <pointer-type-def type-id='type-id-1117' size-in-bits='64' id='type-id-2061'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1121' size-in-bits='64' id='type-id-2062'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1121' size-in-bits='64' id='type-id-2063'/>
+    <pointer-type-def type-id='type-id-1121' size-in-bits='64' id='type-id-2064'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1125' size-in-bits='64' id='type-id-2065'/>
+    <pointer-type-def type-id='type-id-1125' size-in-bits='64' id='type-id-2066'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1129' size-in-bits='64' id='type-id-2067'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1129' size-in-bits='64' id='type-id-2068'/>
+    <pointer-type-def type-id='type-id-1129' size-in-bits='64' id='type-id-2069'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1133' size-in-bits='64' id='type-id-2070'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-2071'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1137' size-in-bits='64' id='type-id-2072'/>
+    <pointer-type-def type-id='type-id-1137' size-in-bits='64' id='type-id-2073'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-2074'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1141' size-in-bits='64' id='type-id-2075'/>
+    <pointer-type-def type-id='type-id-1141' size-in-bits='64' id='type-id-2076'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1145' size-in-bits='64' id='type-id-2077'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1145' size-in-bits='64' id='type-id-2078'/>
+    <pointer-type-def type-id='type-id-1145' size-in-bits='64' id='type-id-2079'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1149' size-in-bits='64' id='type-id-2080'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1149' size-in-bits='64' id='type-id-2081'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-2082'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1153' size-in-bits='64' id='type-id-2083'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1153' size-in-bits='64' id='type-id-2084'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-2085'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-2086'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1157' size-in-bits='64' id='type-id-2087'/>
+    <pointer-type-def type-id='type-id-1157' size-in-bits='64' id='type-id-2088'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1161' size-in-bits='64' id='type-id-2089'/>
+    <pointer-type-def type-id='type-id-2090' size-in-bits='64' id='type-id-2091'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-2092'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1171' size-in-bits='64' id='type-id-2093'/>
+    <pointer-type-def type-id='type-id-1171' size-in-bits='64' id='type-id-2094'/>
+    <pointer-type-def type-id='type-id-2095' size-in-bits='64' id='type-id-2096'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1178' size-in-bits='64' id='type-id-2097'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-2098'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1181' size-in-bits='64' id='type-id-2099'/>
+    <pointer-type-def type-id='type-id-1181' size-in-bits='64' id='type-id-2100'/>
+    <qualified-type-def type-id='type-id-2100' const='yes' id='type-id-2101'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2101' size-in-bits='64' id='type-id-2102'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2100' size-in-bits='64' id='type-id-2103'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2100' size-in-bits='64' id='type-id-2104'/>
+    <pointer-type-def type-id='type-id-2105' size-in-bits='64' id='type-id-2106'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1188' size-in-bits='64' id='type-id-2107'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1191' size-in-bits='64' id='type-id-2108'/>
+    <pointer-type-def type-id='type-id-1191' size-in-bits='64' id='type-id-2109'/>
+    <qualified-type-def type-id='type-id-2109' const='yes' id='type-id-2110'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2110' size-in-bits='64' id='type-id-2111'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2109' size-in-bits='64' id='type-id-2112'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1194' size-in-bits='64' id='type-id-2113'/>
+    <pointer-type-def type-id='type-id-1194' size-in-bits='64' id='type-id-2114'/>
+    <qualified-type-def type-id='type-id-2114' const='yes' id='type-id-2115'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2115' size-in-bits='64' id='type-id-2116'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2114' size-in-bits='64' id='type-id-2117'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2114' size-in-bits='64' id='type-id-2118'/>
+    <pointer-type-def type-id='type-id-2119' size-in-bits='64' id='type-id-2120'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1197' size-in-bits='64' id='type-id-2121'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1197' size-in-bits='64' id='type-id-2122'/>
+    <pointer-type-def type-id='type-id-1197' size-in-bits='64' id='type-id-2123'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-2124'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1200' size-in-bits='64' id='type-id-2125'/>
+    <pointer-type-def type-id='type-id-1200' size-in-bits='64' id='type-id-2126'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-2127'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-2128'/>
+    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-2129'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2130' size-in-bits='64' id='type-id-2131'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2132' size-in-bits='64' id='type-id-2133'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2134' size-in-bits='64' id='type-id-2135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2136' size-in-bits='64' id='type-id-2137'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2138' size-in-bits='64' id='type-id-2139'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2140' size-in-bits='64' id='type-id-2141'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2142' size-in-bits='64' id='type-id-2143'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2144' size-in-bits='64' id='type-id-2145'/>
     <reference-type-def kind='lvalue' type-id='type-id-2146' size-in-bits='64' id='type-id-2147'/>
     <reference-type-def kind='lvalue' type-id='type-id-2148' size-in-bits='64' id='type-id-2149'/>
     <reference-type-def kind='lvalue' type-id='type-id-2150' size-in-bits='64' id='type-id-2151'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2152' size-in-bits='64' id='type-id-2153'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2152' size-in-bits='64' id='type-id-2153'/>
     <reference-type-def kind='lvalue' type-id='type-id-2154' size-in-bits='64' id='type-id-2155'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2154' size-in-bits='64' id='type-id-2156'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2157' size-in-bits='64' id='type-id-2158'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2156' size-in-bits='64' id='type-id-2157'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2156' size-in-bits='64' id='type-id-2158'/>
     <reference-type-def kind='lvalue' type-id='type-id-2159' size-in-bits='64' id='type-id-2160'/>
     <reference-type-def kind='lvalue' type-id='type-id-2161' size-in-bits='64' id='type-id-2162'/>
-    <reference-type-def kind='lvalue' type-id='type-id-188' size-in-bits='64' id='type-id-2163'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2164' size-in-bits='64' id='type-id-2165'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2166' size-in-bits='64' id='type-id-2167'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2166' size-in-bits='64' id='type-id-2168'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2169' size-in-bits='64' id='type-id-2170'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2171' size-in-bits='64' id='type-id-2172'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2173' size-in-bits='64' id='type-id-2174'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2175' size-in-bits='64' id='type-id-2176'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2177' size-in-bits='64' id='type-id-2178'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2179' size-in-bits='64' id='type-id-2180'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2163' size-in-bits='64' id='type-id-2164'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2165' size-in-bits='64' id='type-id-2166'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2167' size-in-bits='64' id='type-id-2168'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2169' size-in-bits='64' id='type-id-2170'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2169' size-in-bits='64' id='type-id-2171'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2172' size-in-bits='64' id='type-id-2173'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2174' size-in-bits='64' id='type-id-2175'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2176' size-in-bits='64' id='type-id-2177'/>
+    <reference-type-def kind='lvalue' type-id='type-id-201' size-in-bits='64' id='type-id-2178'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2179' size-in-bits='64' id='type-id-2180'/>
     <reference-type-def kind='rvalue' type-id='type-id-2181' size-in-bits='64' id='type-id-2182'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2183' size-in-bits='64' id='type-id-2184'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2185' size-in-bits='64' id='type-id-2186'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2187' size-in-bits='64' id='type-id-2188'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2187' size-in-bits='64' id='type-id-2189'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2181' size-in-bits='64' id='type-id-2183'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2184' size-in-bits='64' id='type-id-2185'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2186' size-in-bits='64' id='type-id-2187'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2188' size-in-bits='64' id='type-id-2189'/>
     <reference-type-def kind='rvalue' type-id='type-id-2190' size-in-bits='64' id='type-id-2191'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2192' size-in-bits='64' id='type-id-2193'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2192' size-in-bits='64' id='type-id-2193'/>
     <reference-type-def kind='rvalue' type-id='type-id-2194' size-in-bits='64' id='type-id-2195'/>
     <reference-type-def kind='rvalue' type-id='type-id-2196' size-in-bits='64' id='type-id-2197'/>
     <reference-type-def kind='rvalue' type-id='type-id-2198' size-in-bits='64' id='type-id-2199'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2200' size-in-bits='64' id='type-id-2201'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2202' size-in-bits='64' id='type-id-2203'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2204' size-in-bits='64' id='type-id-2205'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2206' size-in-bits='64' id='type-id-2207'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2208' size-in-bits='64' id='type-id-2209'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2210' size-in-bits='64' id='type-id-2211'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2212' size-in-bits='64' id='type-id-2213'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2214' size-in-bits='64' id='type-id-2215'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2216' size-in-bits='64' id='type-id-2217'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2218' size-in-bits='64' id='type-id-2219'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2220' size-in-bits='64' id='type-id-2221'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2222' size-in-bits='64' id='type-id-2223'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2224' size-in-bits='64' id='type-id-2225'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2226' size-in-bits='64' id='type-id-2227'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2228' size-in-bits='64' id='type-id-2229'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2230' size-in-bits='64' id='type-id-2231'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2232' size-in-bits='64' id='type-id-2233'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2234' size-in-bits='64' id='type-id-2235'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2236' size-in-bits='64' id='type-id-2237'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2238' size-in-bits='64' id='type-id-2239'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2240' size-in-bits='64' id='type-id-2241'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2242' size-in-bits='64' id='type-id-2243'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2244' size-in-bits='64' id='type-id-2245'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2246' size-in-bits='64' id='type-id-2247'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2248' size-in-bits='64' id='type-id-2249'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2250' size-in-bits='64' id='type-id-2251'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2252' size-in-bits='64' id='type-id-2253'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2254' size-in-bits='64' id='type-id-2255'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2256' size-in-bits='64' id='type-id-2257'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2258' size-in-bits='64' id='type-id-2259'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2260' size-in-bits='64' id='type-id-2261'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2260' size-in-bits='64' id='type-id-2262'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2263' size-in-bits='64' id='type-id-2264'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2263' size-in-bits='64' id='type-id-2265'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2266' size-in-bits='64' id='type-id-2267'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2268' size-in-bits='64' id='type-id-2269'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2268' size-in-bits='64' id='type-id-2270'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2271' size-in-bits='64' id='type-id-2272'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2200' size-in-bits='64' id='type-id-2201'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2202' size-in-bits='64' id='type-id-2203'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2202' size-in-bits='64' id='type-id-2204'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2205' size-in-bits='64' id='type-id-2206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2207' size-in-bits='64' id='type-id-2208'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2209' size-in-bits='64' id='type-id-2210'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2211' size-in-bits='64' id='type-id-2212'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2213' size-in-bits='64' id='type-id-2214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2215' size-in-bits='64' id='type-id-2216'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2217' size-in-bits='64' id='type-id-2218'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2219' size-in-bits='64' id='type-id-2220'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2221' size-in-bits='64' id='type-id-2222'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2223' size-in-bits='64' id='type-id-2224'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2225' size-in-bits='64' id='type-id-2226'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2227' size-in-bits='64' id='type-id-2228'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2229' size-in-bits='64' id='type-id-2230'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2231' size-in-bits='64' id='type-id-2232'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2233' size-in-bits='64' id='type-id-2234'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2235' size-in-bits='64' id='type-id-2236'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2237' size-in-bits='64' id='type-id-2238'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2239' size-in-bits='64' id='type-id-2240'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2241' size-in-bits='64' id='type-id-2242'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2243' size-in-bits='64' id='type-id-2244'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2245' size-in-bits='64' id='type-id-2246'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2247' size-in-bits='64' id='type-id-2248'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2249' size-in-bits='64' id='type-id-2250'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2251' size-in-bits='64' id='type-id-2252'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2253' size-in-bits='64' id='type-id-2254'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2255' size-in-bits='64' id='type-id-2256'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2257' size-in-bits='64' id='type-id-2258'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2259' size-in-bits='64' id='type-id-2260'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2261' size-in-bits='64' id='type-id-2262'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2263' size-in-bits='64' id='type-id-2264'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2265' size-in-bits='64' id='type-id-2266'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2267' size-in-bits='64' id='type-id-2268'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2269' size-in-bits='64' id='type-id-2270'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2271' size-in-bits='64' id='type-id-2272'/>
     <reference-type-def kind='rvalue' type-id='type-id-2273' size-in-bits='64' id='type-id-2274'/>
     <reference-type-def kind='lvalue' type-id='type-id-2275' size-in-bits='64' id='type-id-2276'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2277' size-in-bits='64' id='type-id-2278'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2279' size-in-bits='64' id='type-id-2280'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2281' size-in-bits='64' id='type-id-2282'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2275' size-in-bits='64' id='type-id-2277'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2278' size-in-bits='64' id='type-id-2279'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2278' size-in-bits='64' id='type-id-2280'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2281' size-in-bits='64' id='type-id-2282'/>
     <reference-type-def kind='lvalue' type-id='type-id-2283' size-in-bits='64' id='type-id-2284'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2285' size-in-bits='64' id='type-id-2286'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2287' size-in-bits='64' id='type-id-2288'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2289' size-in-bits='64' id='type-id-2290'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2291' size-in-bits='64' id='type-id-2292'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2293' size-in-bits='64' id='type-id-2294'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2295' size-in-bits='64' id='type-id-2296'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2297' size-in-bits='64' id='type-id-2298'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2299' size-in-bits='64' id='type-id-2300'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2301' size-in-bits='64' id='type-id-2302'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2303' size-in-bits='64' id='type-id-2304'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2305' size-in-bits='64' id='type-id-2306'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2307' size-in-bits='64' id='type-id-2308'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2309' size-in-bits='64' id='type-id-2310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2311' size-in-bits='64' id='type-id-2312'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2313' size-in-bits='64' id='type-id-2314'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2315' size-in-bits='64' id='type-id-2316'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2317' size-in-bits='64' id='type-id-2318'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2319' size-in-bits='64' id='type-id-2320'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2321' size-in-bits='64' id='type-id-2322'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2323' size-in-bits='64' id='type-id-2324'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2325' size-in-bits='64' id='type-id-2326'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2327' size-in-bits='64' id='type-id-2328'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2329' size-in-bits='64' id='type-id-2330'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2331'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1195' size-in-bits='64' id='type-id-2332'/>
-    <pointer-type-def type-id='type-id-1195' size-in-bits='64' id='type-id-2333'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1198' size-in-bits='64' id='type-id-2334'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1198' size-in-bits='64' id='type-id-2335'/>
-    <pointer-type-def type-id='type-id-1198' size-in-bits='64' id='type-id-2336'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-2337'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1201' size-in-bits='64' id='type-id-2338'/>
-    <pointer-type-def type-id='type-id-1201' size-in-bits='64' id='type-id-2339'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-2340'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1204' size-in-bits='64' id='type-id-2341'/>
-    <pointer-type-def type-id='type-id-1204' size-in-bits='64' id='type-id-2342'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-2343'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-2344'/>
-    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-2345'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-2346'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1211' size-in-bits='64' id='type-id-2347'/>
-    <pointer-type-def type-id='type-id-1211' size-in-bits='64' id='type-id-2348'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1215' size-in-bits='64' id='type-id-2349'/>
-    <pointer-type-def type-id='type-id-1215' size-in-bits='64' id='type-id-2350'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2351' size-in-bits='64' id='type-id-2352'/>
-    <pointer-type-def type-id='type-id-2351' size-in-bits='64' id='type-id-2353'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2354' size-in-bits='64' id='type-id-2355'/>
-    <pointer-type-def type-id='type-id-2354' size-in-bits='64' id='type-id-2356'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-2357'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-2358'/>
-    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-2359'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2360' size-in-bits='64' id='type-id-2361'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2360' size-in-bits='64' id='type-id-2362'/>
-    <pointer-type-def type-id='type-id-2360' size-in-bits='64' id='type-id-2363'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1222' size-in-bits='64' id='type-id-2364'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1222' size-in-bits='64' id='type-id-2365'/>
-    <pointer-type-def type-id='type-id-1222' size-in-bits='64' id='type-id-2366'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1225' size-in-bits='64' id='type-id-2367'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1225' size-in-bits='64' id='type-id-2368'/>
-    <pointer-type-def type-id='type-id-1225' size-in-bits='64' id='type-id-2369'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1228' size-in-bits='64' id='type-id-2370'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1228' size-in-bits='64' id='type-id-2371'/>
-    <pointer-type-def type-id='type-id-1228' size-in-bits='64' id='type-id-2372'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-2373'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-2374'/>
-    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-2375'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-2376'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-2377'/>
-    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-2378'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1237' size-in-bits='64' id='type-id-2379'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1237' size-in-bits='64' id='type-id-2380'/>
-    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-2381'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-2382'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-2383'/>
-    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-2384'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-2385'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-2386'/>
-    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-2387'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-2388'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-2389'/>
-    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-2390'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1249' size-in-bits='64' id='type-id-2391'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1249' size-in-bits='64' id='type-id-2392'/>
-    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-2393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-2394'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-2395'/>
-    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-2396'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-2397'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-2398'/>
-    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-2399'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-2400'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-2401'/>
-    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-2402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1261' size-in-bits='64' id='type-id-2403'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1261' size-in-bits='64' id='type-id-2404'/>
-    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-2405'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-2406'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-2407'/>
-    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-2408'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-2409'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-2410'/>
-    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-2411'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-2412'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-2413'/>
-    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-2414'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-2415'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-2416'/>
-    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-2417'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2418' size-in-bits='64' id='type-id-2419'/>
-    <pointer-type-def type-id='type-id-2418' size-in-bits='64' id='type-id-2420'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1277' size-in-bits='64' id='type-id-2421'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1277' size-in-bits='64' id='type-id-2422'/>
-    <pointer-type-def type-id='type-id-1277' size-in-bits='64' id='type-id-2423'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1281' size-in-bits='64' id='type-id-2424'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1284' size-in-bits='64' id='type-id-2425'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1284' size-in-bits='64' id='type-id-2426'/>
-    <pointer-type-def type-id='type-id-1284' size-in-bits='64' id='type-id-2427'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1288' size-in-bits='64' id='type-id-2428'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1291' size-in-bits='64' id='type-id-2429'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1291' size-in-bits='64' id='type-id-2430'/>
-    <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-2431'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1295' size-in-bits='64' id='type-id-2432'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1298' size-in-bits='64' id='type-id-2433'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1298' size-in-bits='64' id='type-id-2434'/>
-    <pointer-type-def type-id='type-id-1298' size-in-bits='64' id='type-id-2435'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1302' size-in-bits='64' id='type-id-2436'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1305' size-in-bits='64' id='type-id-2437'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1305' size-in-bits='64' id='type-id-2438'/>
-    <pointer-type-def type-id='type-id-1305' size-in-bits='64' id='type-id-2439'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1318' size-in-bits='64' id='type-id-2440'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1321' size-in-bits='64' id='type-id-2441'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1321' size-in-bits='64' id='type-id-2442'/>
-    <pointer-type-def type-id='type-id-1321' size-in-bits='64' id='type-id-2443'/>
-    <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-2444'/>
-    <pointer-type-def type-id='type-id-57' size-in-bits='64' id='type-id-2445'/>
-    <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-2446'/>
-    <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-2447'/>
-    <reference-type-def kind='lvalue' type-id='type-id-91' size-in-bits='64' id='type-id-2448'/>
-    <reference-type-def kind='rvalue' type-id='type-id-91' size-in-bits='64' id='type-id-2449'/>
-    <pointer-type-def type-id='type-id-2450' size-in-bits='64' id='type-id-2451'/>
-    <qualified-type-def type-id='type-id-2451' const='yes' id='type-id-2452'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2452' size-in-bits='64' id='type-id-2453'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2451' size-in-bits='64' id='type-id-2454'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2451' size-in-bits='64' id='type-id-2455'/>
-    <pointer-type-def type-id='type-id-2456' size-in-bits='64' id='type-id-2457'/>
-    <qualified-type-def type-id='type-id-2457' const='yes' id='type-id-2458'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2458' size-in-bits='64' id='type-id-2459'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2457' size-in-bits='64' id='type-id-2460'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2457' size-in-bits='64' id='type-id-2461'/>
-    <pointer-type-def type-id='type-id-2462' size-in-bits='64' id='type-id-2463'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2463' size-in-bits='64' id='type-id-2464'/>
-    <pointer-type-def type-id='type-id-2465' size-in-bits='64' id='type-id-2466'/>
-    <pointer-type-def type-id='type-id-2467' size-in-bits='64' id='type-id-2468'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2468' size-in-bits='64' id='type-id-2469'/>
-    <pointer-type-def type-id='type-id-2470' size-in-bits='64' id='type-id-2471'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2283' size-in-bits='64' id='type-id-2285'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2286' size-in-bits='64' id='type-id-2287'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2288' size-in-bits='64' id='type-id-2289'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2290' size-in-bits='64' id='type-id-2291'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2292' size-in-bits='64' id='type-id-2293'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2294' size-in-bits='64' id='type-id-2295'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2296' size-in-bits='64' id='type-id-2297'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2298' size-in-bits='64' id='type-id-2299'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2300' size-in-bits='64' id='type-id-2301'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2302' size-in-bits='64' id='type-id-2303'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2304' size-in-bits='64' id='type-id-2305'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2306' size-in-bits='64' id='type-id-2307'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2308' size-in-bits='64' id='type-id-2309'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2310' size-in-bits='64' id='type-id-2311'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2312' size-in-bits='64' id='type-id-2313'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2314' size-in-bits='64' id='type-id-2315'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2316' size-in-bits='64' id='type-id-2317'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2318' size-in-bits='64' id='type-id-2319'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2320' size-in-bits='64' id='type-id-2321'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2322' size-in-bits='64' id='type-id-2323'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2324' size-in-bits='64' id='type-id-2325'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2326' size-in-bits='64' id='type-id-2327'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2328' size-in-bits='64' id='type-id-2329'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2330' size-in-bits='64' id='type-id-2331'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2332' size-in-bits='64' id='type-id-2333'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2334' size-in-bits='64' id='type-id-2335'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2336' size-in-bits='64' id='type-id-2337'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2338' size-in-bits='64' id='type-id-2339'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2340' size-in-bits='64' id='type-id-2341'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2342' size-in-bits='64' id='type-id-2343'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2344' size-in-bits='64' id='type-id-2345'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2346' size-in-bits='64' id='type-id-2347'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2348' size-in-bits='64' id='type-id-2349'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-2350'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1207' size-in-bits='64' id='type-id-2351'/>
+    <pointer-type-def type-id='type-id-1207' size-in-bits='64' id='type-id-2352'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-2353'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1210' size-in-bits='64' id='type-id-2354'/>
+    <pointer-type-def type-id='type-id-1210' size-in-bits='64' id='type-id-2355'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-2356'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1213' size-in-bits='64' id='type-id-2357'/>
+    <pointer-type-def type-id='type-id-1213' size-in-bits='64' id='type-id-2358'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-2359'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1216' size-in-bits='64' id='type-id-2360'/>
+    <pointer-type-def type-id='type-id-1216' size-in-bits='64' id='type-id-2361'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-2362'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1219' size-in-bits='64' id='type-id-2363'/>
+    <pointer-type-def type-id='type-id-1219' size-in-bits='64' id='type-id-2364'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-2365'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1223' size-in-bits='64' id='type-id-2366'/>
+    <pointer-type-def type-id='type-id-1223' size-in-bits='64' id='type-id-2367'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1227' size-in-bits='64' id='type-id-2368'/>
+    <pointer-type-def type-id='type-id-1227' size-in-bits='64' id='type-id-2369'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2370' size-in-bits='64' id='type-id-2371'/>
+    <pointer-type-def type-id='type-id-2370' size-in-bits='64' id='type-id-2372'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2373' size-in-bits='64' id='type-id-2374'/>
+    <pointer-type-def type-id='type-id-2373' size-in-bits='64' id='type-id-2375'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-2376'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1231' size-in-bits='64' id='type-id-2377'/>
+    <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-2378'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2379' size-in-bits='64' id='type-id-2380'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2379' size-in-bits='64' id='type-id-2381'/>
+    <pointer-type-def type-id='type-id-2379' size-in-bits='64' id='type-id-2382'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-2383'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1234' size-in-bits='64' id='type-id-2384'/>
+    <pointer-type-def type-id='type-id-1234' size-in-bits='64' id='type-id-2385'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1237' size-in-bits='64' id='type-id-2386'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1237' size-in-bits='64' id='type-id-2387'/>
+    <pointer-type-def type-id='type-id-1237' size-in-bits='64' id='type-id-2388'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-2389'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1240' size-in-bits='64' id='type-id-2390'/>
+    <pointer-type-def type-id='type-id-1240' size-in-bits='64' id='type-id-2391'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-2392'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1243' size-in-bits='64' id='type-id-2393'/>
+    <pointer-type-def type-id='type-id-1243' size-in-bits='64' id='type-id-2394'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-2395'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1246' size-in-bits='64' id='type-id-2396'/>
+    <pointer-type-def type-id='type-id-1246' size-in-bits='64' id='type-id-2397'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1249' size-in-bits='64' id='type-id-2398'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1249' size-in-bits='64' id='type-id-2399'/>
+    <pointer-type-def type-id='type-id-1249' size-in-bits='64' id='type-id-2400'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-2401'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1252' size-in-bits='64' id='type-id-2402'/>
+    <pointer-type-def type-id='type-id-1252' size-in-bits='64' id='type-id-2403'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-2404'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1255' size-in-bits='64' id='type-id-2405'/>
+    <pointer-type-def type-id='type-id-1255' size-in-bits='64' id='type-id-2406'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-2407'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1258' size-in-bits='64' id='type-id-2408'/>
+    <pointer-type-def type-id='type-id-1258' size-in-bits='64' id='type-id-2409'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1261' size-in-bits='64' id='type-id-2410'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1261' size-in-bits='64' id='type-id-2411'/>
+    <pointer-type-def type-id='type-id-1261' size-in-bits='64' id='type-id-2412'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-2413'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1264' size-in-bits='64' id='type-id-2414'/>
+    <pointer-type-def type-id='type-id-1264' size-in-bits='64' id='type-id-2415'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-2416'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1267' size-in-bits='64' id='type-id-2417'/>
+    <pointer-type-def type-id='type-id-1267' size-in-bits='64' id='type-id-2418'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-2419'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1270' size-in-bits='64' id='type-id-2420'/>
+    <pointer-type-def type-id='type-id-1270' size-in-bits='64' id='type-id-2421'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-2422'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1273' size-in-bits='64' id='type-id-2423'/>
+    <pointer-type-def type-id='type-id-1273' size-in-bits='64' id='type-id-2424'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-2425'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1276' size-in-bits='64' id='type-id-2426'/>
+    <pointer-type-def type-id='type-id-1276' size-in-bits='64' id='type-id-2427'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1279' size-in-bits='64' id='type-id-2428'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1279' size-in-bits='64' id='type-id-2429'/>
+    <pointer-type-def type-id='type-id-1279' size-in-bits='64' id='type-id-2430'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-2431'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1282' size-in-bits='64' id='type-id-2432'/>
+    <pointer-type-def type-id='type-id-1282' size-in-bits='64' id='type-id-2433'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-2434'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1285' size-in-bits='64' id='type-id-2435'/>
+    <pointer-type-def type-id='type-id-1285' size-in-bits='64' id='type-id-2436'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2437' size-in-bits='64' id='type-id-2438'/>
+    <pointer-type-def type-id='type-id-2437' size-in-bits='64' id='type-id-2439'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1289' size-in-bits='64' id='type-id-2440'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1289' size-in-bits='64' id='type-id-2441'/>
+    <pointer-type-def type-id='type-id-1289' size-in-bits='64' id='type-id-2442'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1293' size-in-bits='64' id='type-id-2443'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1296' size-in-bits='64' id='type-id-2444'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1296' size-in-bits='64' id='type-id-2445'/>
+    <pointer-type-def type-id='type-id-1296' size-in-bits='64' id='type-id-2446'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1300' size-in-bits='64' id='type-id-2447'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-2448'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1303' size-in-bits='64' id='type-id-2449'/>
+    <pointer-type-def type-id='type-id-1303' size-in-bits='64' id='type-id-2450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1307' size-in-bits='64' id='type-id-2451'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1310' size-in-bits='64' id='type-id-2452'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1310' size-in-bits='64' id='type-id-2453'/>
+    <pointer-type-def type-id='type-id-1310' size-in-bits='64' id='type-id-2454'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1314' size-in-bits='64' id='type-id-2455'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-2456'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1317' size-in-bits='64' id='type-id-2457'/>
+    <pointer-type-def type-id='type-id-1317' size-in-bits='64' id='type-id-2458'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1330' size-in-bits='64' id='type-id-2459'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1333' size-in-bits='64' id='type-id-2460'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1333' size-in-bits='64' id='type-id-2461'/>
+    <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-2462'/>
+    <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-2463'/>
+    <pointer-type-def type-id='type-id-62' size-in-bits='64' id='type-id-2464'/>
+    <pointer-type-def type-id='type-id-100' size-in-bits='64' id='type-id-2465'/>
+    <reference-type-def kind='lvalue' type-id='type-id-53' size-in-bits='64' id='type-id-2466'/>
+    <reference-type-def kind='lvalue' type-id='type-id-96' size-in-bits='64' id='type-id-2467'/>
+    <reference-type-def kind='rvalue' type-id='type-id-96' size-in-bits='64' id='type-id-2468'/>
+    <pointer-type-def type-id='type-id-2469' size-in-bits='64' id='type-id-2470'/>
+    <qualified-type-def type-id='type-id-2470' const='yes' id='type-id-2471'/>
     <reference-type-def kind='lvalue' type-id='type-id-2471' size-in-bits='64' id='type-id-2472'/>
-    <pointer-type-def type-id='type-id-2473' size-in-bits='64' id='type-id-2474'/>
-    <qualified-type-def type-id='type-id-2474' const='yes' id='type-id-2475'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2475' size-in-bits='64' id='type-id-2476'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2474' size-in-bits='64' id='type-id-2477'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2474' size-in-bits='64' id='type-id-2478'/>
-    <pointer-type-def type-id='type-id-2479' size-in-bits='64' id='type-id-2480'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2450' size-in-bits='64' id='type-id-2481'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2456' size-in-bits='64' id='type-id-2482'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2473' size-in-bits='64' id='type-id-2483'/>
-    <qualified-type-def type-id='type-id-2484' volatile='yes' id='type-id-1336'/>
-    <qualified-type-def type-id='type-id-2485' volatile='yes' id='type-id-1339'/>
-    <qualified-type-def type-id='type-id-2486' volatile='yes' id='type-id-1342'/>
-    <qualified-type-def type-id='type-id-2487' volatile='yes' id='type-id-1345'/>
-    <qualified-type-def type-id='type-id-2488' volatile='yes' id='type-id-1348'/>
-    <qualified-type-def type-id='type-id-2489' volatile='yes' id='type-id-1351'/>
-    <qualified-type-def type-id='type-id-2490' volatile='yes' id='type-id-1354'/>
-    <qualified-type-def type-id='type-id-2491' volatile='yes' id='type-id-1357'/>
-    <qualified-type-def type-id='type-id-2492' volatile='yes' id='type-id-1360'/>
-    <qualified-type-def type-id='type-id-2493' volatile='yes' id='type-id-1363'/>
-    <qualified-type-def type-id='type-id-2494' volatile='yes' id='type-id-1366'/>
-    <qualified-type-def type-id='type-id-2495' volatile='yes' id='type-id-1369'/>
-    <qualified-type-def type-id='type-id-2496' volatile='yes' id='type-id-1372'/>
-    <qualified-type-def type-id='type-id-2497' volatile='yes' id='type-id-1375'/>
-    <qualified-type-def type-id='type-id-2498' volatile='yes' id='type-id-1378'/>
-    <qualified-type-def type-id='type-id-2499' volatile='yes' id='type-id-1381'/>
-    <qualified-type-def type-id='type-id-674' volatile='yes' id='type-id-1384'/>
-    <qualified-type-def type-id='type-id-677' volatile='yes' id='type-id-1387'/>
-    <qualified-type-def type-id='type-id-935' volatile='yes' id='type-id-1390'/>
-    <pointer-type-def type-id='type-id-1390' size-in-bits='64' id='type-id-2500'/>
-    <qualified-type-def type-id='type-id-1075' volatile='yes' id='type-id-2501'/>
-    <pointer-type-def type-id='type-id-2501' size-in-bits='64' id='type-id-2502'/>
-    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-2503'/>
-    <qualified-type-def type-id='type-id-2503' restrict='yes' id='type-id-2504'/>
-    <pointer-type-def type-id='type-id-2503' size-in-bits='64' id='type-id-2505'/>
-    <qualified-type-def type-id='type-id-2505' restrict='yes' id='type-id-2506'/>
-    <pointer-type-def type-id='type-id-2507' size-in-bits='64' id='type-id-2508'/>
-    <qualified-type-def type-id='type-id-2508' restrict='yes' id='type-id-2509'/>
-    <pointer-type-def type-id='type-id-2510' size-in-bits='64' id='type-id-2511'/>
-    <qualified-type-def type-id='type-id-2511' restrict='yes' id='type-id-2512'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2513' size-in-bits='64' id='type-id-2514'/>
-    <pointer-type-def type-id='type-id-2515' size-in-bits='64' id='type-id-2516'/>
-    <qualified-type-def type-id='type-id-2513' const='yes' id='type-id-2517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2517' size-in-bits='64' id='type-id-2518'/>
-    <qualified-type-def type-id='type-id-2519' const='yes' id='type-id-2520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2520' size-in-bits='64' id='type-id-2521'/>
-    <qualified-type-def type-id='type-id-2522' const='yes' id='type-id-2523'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2523' size-in-bits='64' id='type-id-2524'/>
-    <qualified-type-def type-id='type-id-2525' const='yes' id='type-id-2526'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2526' size-in-bits='64' id='type-id-2527'/>
-    <qualified-type-def type-id='type-id-2528' const='yes' id='type-id-2529'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2529' size-in-bits='64' id='type-id-2530'/>
-    <qualified-type-def type-id='type-id-2531' const='yes' id='type-id-2532'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2532' size-in-bits='64' id='type-id-2533'/>
-    <qualified-type-def type-id='type-id-2534' const='yes' id='type-id-2535'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2535' size-in-bits='64' id='type-id-2536'/>
-    <qualified-type-def type-id='type-id-2537' const='yes' id='type-id-2538'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2470' size-in-bits='64' id='type-id-2473'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2470' size-in-bits='64' id='type-id-2474'/>
+    <pointer-type-def type-id='type-id-2475' size-in-bits='64' id='type-id-2476'/>
+    <qualified-type-def type-id='type-id-2476' const='yes' id='type-id-2477'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2477' size-in-bits='64' id='type-id-2478'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2476' size-in-bits='64' id='type-id-2479'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2476' size-in-bits='64' id='type-id-2480'/>
+    <pointer-type-def type-id='type-id-2481' size-in-bits='64' id='type-id-2482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2482' size-in-bits='64' id='type-id-2483'/>
+    <pointer-type-def type-id='type-id-2484' size-in-bits='64' id='type-id-2485'/>
+    <pointer-type-def type-id='type-id-2486' size-in-bits='64' id='type-id-2487'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2487' size-in-bits='64' id='type-id-2488'/>
+    <pointer-type-def type-id='type-id-2489' size-in-bits='64' id='type-id-2490'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2490' size-in-bits='64' id='type-id-2491'/>
+    <pointer-type-def type-id='type-id-2492' size-in-bits='64' id='type-id-2493'/>
+    <qualified-type-def type-id='type-id-2493' const='yes' id='type-id-2494'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2494' size-in-bits='64' id='type-id-2495'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2493' size-in-bits='64' id='type-id-2496'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2493' size-in-bits='64' id='type-id-2497'/>
+    <pointer-type-def type-id='type-id-2498' size-in-bits='64' id='type-id-2499'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2469' size-in-bits='64' id='type-id-2500'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2475' size-in-bits='64' id='type-id-2501'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2492' size-in-bits='64' id='type-id-2502'/>
+    <reference-type-def kind='rvalue' type-id='type-id-119' size-in-bits='64' id='type-id-2503'/>
+    <reference-type-def kind='rvalue' type-id='type-id-121' size-in-bits='64' id='type-id-2504'/>
+    <qualified-type-def type-id='type-id-2505' volatile='yes' id='type-id-1348'/>
+    <qualified-type-def type-id='type-id-2506' volatile='yes' id='type-id-1351'/>
+    <qualified-type-def type-id='type-id-2507' volatile='yes' id='type-id-1354'/>
+    <qualified-type-def type-id='type-id-2508' volatile='yes' id='type-id-1357'/>
+    <qualified-type-def type-id='type-id-2509' volatile='yes' id='type-id-1360'/>
+    <qualified-type-def type-id='type-id-2510' volatile='yes' id='type-id-1363'/>
+    <qualified-type-def type-id='type-id-2511' volatile='yes' id='type-id-1366'/>
+    <qualified-type-def type-id='type-id-2512' volatile='yes' id='type-id-1369'/>
+    <qualified-type-def type-id='type-id-2513' volatile='yes' id='type-id-1372'/>
+    <qualified-type-def type-id='type-id-2514' volatile='yes' id='type-id-1375'/>
+    <qualified-type-def type-id='type-id-2515' volatile='yes' id='type-id-1378'/>
+    <qualified-type-def type-id='type-id-2516' volatile='yes' id='type-id-1381'/>
+    <qualified-type-def type-id='type-id-2517' volatile='yes' id='type-id-1384'/>
+    <qualified-type-def type-id='type-id-2518' volatile='yes' id='type-id-1387'/>
+    <qualified-type-def type-id='type-id-2519' volatile='yes' id='type-id-1390'/>
+    <qualified-type-def type-id='type-id-2520' volatile='yes' id='type-id-1393'/>
+    <qualified-type-def type-id='type-id-686' volatile='yes' id='type-id-1396'/>
+    <qualified-type-def type-id='type-id-689' volatile='yes' id='type-id-1399'/>
+    <qualified-type-def type-id='type-id-947' volatile='yes' id='type-id-1402'/>
+    <pointer-type-def type-id='type-id-1402' size-in-bits='64' id='type-id-2521'/>
+    <qualified-type-def type-id='type-id-1087' volatile='yes' id='type-id-2522'/>
+    <pointer-type-def type-id='type-id-2522' size-in-bits='64' id='type-id-2523'/>
+    <pointer-type-def type-id='type-id-125' size-in-bits='64' id='type-id-2524'/>
+    <qualified-type-def type-id='type-id-2524' restrict='yes' id='type-id-2525'/>
+    <pointer-type-def type-id='type-id-2524' size-in-bits='64' id='type-id-2526'/>
+    <qualified-type-def type-id='type-id-2526' restrict='yes' id='type-id-2527'/>
+    <pointer-type-def type-id='type-id-2528' size-in-bits='64' id='type-id-2529'/>
+    <qualified-type-def type-id='type-id-2529' restrict='yes' id='type-id-2530'/>
+    <pointer-type-def type-id='type-id-2531' size-in-bits='64' id='type-id-2532'/>
+    <qualified-type-def type-id='type-id-2532' restrict='yes' id='type-id-2533'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2534' size-in-bits='64' id='type-id-2535'/>
+    <pointer-type-def type-id='type-id-2536' size-in-bits='64' id='type-id-2537'/>
+    <qualified-type-def type-id='type-id-2534' const='yes' id='type-id-2538'/>
     <reference-type-def kind='lvalue' type-id='type-id-2538' size-in-bits='64' id='type-id-2539'/>
     <qualified-type-def type-id='type-id-2540' const='yes' id='type-id-2541'/>
     <reference-type-def kind='lvalue' type-id='type-id-2541' size-in-bits='64' id='type-id-2542'/>
@@ -3916,9 +3913,8 @@
     <reference-type-def kind='lvalue' type-id='type-id-2553' size-in-bits='64' id='type-id-2554'/>
     <qualified-type-def type-id='type-id-2555' const='yes' id='type-id-2556'/>
     <reference-type-def kind='lvalue' type-id='type-id-2556' size-in-bits='64' id='type-id-2557'/>
-    <pointer-type-def type-id='type-id-2556' size-in-bits='64' id='type-id-2558'/>
-    <pointer-type-def type-id='type-id-2556' size-in-bits='64' id='type-id-2559'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2558' size-in-bits='64' id='type-id-2560'/>
+    <qualified-type-def type-id='type-id-2558' const='yes' id='type-id-2559'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2559' size-in-bits='64' id='type-id-2560'/>
     <qualified-type-def type-id='type-id-2561' const='yes' id='type-id-2562'/>
     <reference-type-def kind='lvalue' type-id='type-id-2562' size-in-bits='64' id='type-id-2563'/>
     <qualified-type-def type-id='type-id-2564' const='yes' id='type-id-2565'/>
@@ -3931,1167 +3927,1184 @@
     <reference-type-def kind='lvalue' type-id='type-id-2574' size-in-bits='64' id='type-id-2575'/>
     <qualified-type-def type-id='type-id-2576' const='yes' id='type-id-2577'/>
     <reference-type-def kind='lvalue' type-id='type-id-2577' size-in-bits='64' id='type-id-2578'/>
-    <qualified-type-def type-id='type-id-2579' const='yes' id='type-id-2580'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2580' size-in-bits='64' id='type-id-2581'/>
-    <pointer-type-def type-id='type-id-2582' size-in-bits='64' id='type-id-2583'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2584' size-in-bits='64' id='type-id-2585'/>
+    <pointer-type-def type-id='type-id-2577' size-in-bits='64' id='type-id-2579'/>
+    <pointer-type-def type-id='type-id-2577' size-in-bits='64' id='type-id-2580'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2579' size-in-bits='64' id='type-id-2581'/>
+    <qualified-type-def type-id='type-id-2582' const='yes' id='type-id-2583'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2583' size-in-bits='64' id='type-id-2584'/>
+    <qualified-type-def type-id='type-id-2585' const='yes' id='type-id-2586'/>
     <reference-type-def kind='lvalue' type-id='type-id-2586' size-in-bits='64' id='type-id-2587'/>
-    <pointer-type-def type-id='type-id-2588' size-in-bits='64' id='type-id-2589'/>
-    <pointer-type-def type-id='type-id-2588' size-in-bits='64' id='type-id-2590'/>
-    <qualified-type-def type-id='type-id-2589' const='yes' id='type-id-2591'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2591' size-in-bits='64' id='type-id-2592'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2589' size-in-bits='64' id='type-id-2593'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2589' size-in-bits='64' id='type-id-2594'/>
+    <qualified-type-def type-id='type-id-2588' const='yes' id='type-id-2589'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2589' size-in-bits='64' id='type-id-2590'/>
+    <qualified-type-def type-id='type-id-2591' const='yes' id='type-id-2592'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2592' size-in-bits='64' id='type-id-2593'/>
+    <qualified-type-def type-id='type-id-2594' const='yes' id='type-id-2595'/>
     <reference-type-def kind='lvalue' type-id='type-id-2595' size-in-bits='64' id='type-id-2596'/>
-    <pointer-type-def type-id='type-id-2595' size-in-bits='64' id='type-id-2597'/>
     <qualified-type-def type-id='type-id-2597' const='yes' id='type-id-2598'/>
     <reference-type-def kind='lvalue' type-id='type-id-2598' size-in-bits='64' id='type-id-2599'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2597' size-in-bits='64' id='type-id-2600'/>
-    <pointer-type-def type-id='type-id-2601' size-in-bits='64' id='type-id-2602'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2603' size-in-bits='64' id='type-id-2604'/>
-    <pointer-type-def type-id='type-id-2603' size-in-bits='64' id='type-id-2605'/>
+    <qualified-type-def type-id='type-id-2600' const='yes' id='type-id-2601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2601' size-in-bits='64' id='type-id-2602'/>
+    <pointer-type-def type-id='type-id-2603' size-in-bits='64' id='type-id-2604'/>
     <reference-type-def kind='lvalue' type-id='type-id-2605' size-in-bits='64' id='type-id-2606'/>
     <reference-type-def kind='lvalue' type-id='type-id-2607' size-in-bits='64' id='type-id-2608'/>
-    <pointer-type-def type-id='type-id-2607' size-in-bits='64' id='type-id-2609'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2609' size-in-bits='64' id='type-id-2610'/>
-    <pointer-type-def type-id='type-id-2611' size-in-bits='64' id='type-id-2612'/>
-    <qualified-type-def type-id='type-id-2612' const='yes' id='type-id-2613'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2613' size-in-bits='64' id='type-id-2614'/>
-    <pointer-type-def type-id='type-id-2613' size-in-bits='64' id='type-id-2615'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2612' size-in-bits='64' id='type-id-2616'/>
-    <pointer-type-def type-id='type-id-2612' size-in-bits='64' id='type-id-2617'/>
-    <pointer-type-def type-id='type-id-2618' size-in-bits='64' id='type-id-2619'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2620' size-in-bits='64' id='type-id-2621'/>
-    <pointer-type-def type-id='type-id-2620' size-in-bits='64' id='type-id-2622'/>
-    <qualified-type-def type-id='type-id-2622' const='yes' id='type-id-2623'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2623' size-in-bits='64' id='type-id-2624'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2622' size-in-bits='64' id='type-id-2625'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2622' size-in-bits='64' id='type-id-2626'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2531' size-in-bits='64' id='type-id-2627'/>
+    <pointer-type-def type-id='type-id-2609' size-in-bits='64' id='type-id-2610'/>
+    <pointer-type-def type-id='type-id-2609' size-in-bits='64' id='type-id-2611'/>
+    <qualified-type-def type-id='type-id-2610' const='yes' id='type-id-2612'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2612' size-in-bits='64' id='type-id-2613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2610' size-in-bits='64' id='type-id-2614'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2610' size-in-bits='64' id='type-id-2615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2616' size-in-bits='64' id='type-id-2617'/>
+    <pointer-type-def type-id='type-id-2616' size-in-bits='64' id='type-id-2618'/>
+    <qualified-type-def type-id='type-id-2618' const='yes' id='type-id-2619'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2619' size-in-bits='64' id='type-id-2620'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2618' size-in-bits='64' id='type-id-2621'/>
+    <pointer-type-def type-id='type-id-2622' size-in-bits='64' id='type-id-2623'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2624' size-in-bits='64' id='type-id-2625'/>
+    <pointer-type-def type-id='type-id-2624' size-in-bits='64' id='type-id-2626'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2626' size-in-bits='64' id='type-id-2627'/>
     <reference-type-def kind='lvalue' type-id='type-id-2628' size-in-bits='64' id='type-id-2629'/>
-    <pointer-type-def type-id='type-id-2630' size-in-bits='64' id='type-id-2631'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2632' size-in-bits='64' id='type-id-2633'/>
-    <pointer-type-def type-id='type-id-2632' size-in-bits='64' id='type-id-2634'/>
-    <qualified-type-def type-id='type-id-2634' const='yes' id='type-id-2635'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2635' size-in-bits='64' id='type-id-2636'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2634' size-in-bits='64' id='type-id-2637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2549' size-in-bits='64' id='type-id-2638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2639' size-in-bits='64' id='type-id-2640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2641' size-in-bits='64' id='type-id-2642'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2643' size-in-bits='64' id='type-id-2644'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2645' size-in-bits='64' id='type-id-2646'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2647' size-in-bits='64' id='type-id-2648'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2649' size-in-bits='64' id='type-id-2650'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2651' size-in-bits='64' id='type-id-2652'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2653' size-in-bits='64' id='type-id-2654'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2655' size-in-bits='64' id='type-id-2656'/>
+    <pointer-type-def type-id='type-id-2628' size-in-bits='64' id='type-id-2630'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2630' size-in-bits='64' id='type-id-2631'/>
+    <pointer-type-def type-id='type-id-2632' size-in-bits='64' id='type-id-2633'/>
+    <qualified-type-def type-id='type-id-2633' const='yes' id='type-id-2634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2634' size-in-bits='64' id='type-id-2635'/>
+    <pointer-type-def type-id='type-id-2634' size-in-bits='64' id='type-id-2636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2633' size-in-bits='64' id='type-id-2637'/>
+    <pointer-type-def type-id='type-id-2633' size-in-bits='64' id='type-id-2638'/>
+    <pointer-type-def type-id='type-id-2639' size-in-bits='64' id='type-id-2640'/>
+    <reference-type-def kind='lvalue' type-id='type-id-47' size-in-bits='64' id='type-id-2641'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-2642'/>
+    <pointer-type-def type-id='type-id-47' size-in-bits='64' id='type-id-2643'/>
+    <qualified-type-def type-id='type-id-2642' const='yes' id='type-id-2644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2644' size-in-bits='64' id='type-id-2645'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2642' size-in-bits='64' id='type-id-2646'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2642' size-in-bits='64' id='type-id-2647'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-2648'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2552' size-in-bits='64' id='type-id-2649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2650' size-in-bits='64' id='type-id-2651'/>
+    <pointer-type-def type-id='type-id-2652' size-in-bits='64' id='type-id-2653'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2654' size-in-bits='64' id='type-id-2655'/>
+    <pointer-type-def type-id='type-id-2654' size-in-bits='64' id='type-id-2656'/>
+    <qualified-type-def type-id='type-id-2656' const='yes' id='type-id-2657'/>
     <reference-type-def kind='lvalue' type-id='type-id-2657' size-in-bits='64' id='type-id-2658'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2659' size-in-bits='64' id='type-id-2660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2656' size-in-bits='64' id='type-id-2659'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2570' size-in-bits='64' id='type-id-2660'/>
     <reference-type-def kind='lvalue' type-id='type-id-2661' size-in-bits='64' id='type-id-2662'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2552' size-in-bits='64' id='type-id-2663'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2561' size-in-bits='64' id='type-id-2664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2663' size-in-bits='64' id='type-id-2664'/>
     <reference-type-def kind='lvalue' type-id='type-id-2665' size-in-bits='64' id='type-id-2666'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2564' size-in-bits='64' id='type-id-2667'/>
-    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2668'/>
-    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2582'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-2669'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-2670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2667' size-in-bits='64' id='type-id-2668'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2669' size-in-bits='64' id='type-id-2670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2671' size-in-bits='64' id='type-id-2672'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2673' size-in-bits='64' id='type-id-2674'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2675' size-in-bits='64' id='type-id-2676'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2677' size-in-bits='64' id='type-id-2678'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2679' size-in-bits='64' id='type-id-2680'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2681' size-in-bits='64' id='type-id-2682'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2683' size-in-bits='64' id='type-id-2684'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2573' size-in-bits='64' id='type-id-2685'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2582' size-in-bits='64' id='type-id-2686'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2687' size-in-bits='64' id='type-id-2688'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2585' size-in-bits='64' id='type-id-2689'/>
+    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2690'/>
+    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2603'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-2691'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-2692'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-120'>
+      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-133'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2671'/>
+          <typedef-decl name='const_pointer' type-id='type-id-418' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2693'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-404' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2672'/>
+          <typedef-decl name='const_reference' type-id='type-id-417' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2694'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1476' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2673'/>
+          <typedef-decl name='pointer' type-id='type-id-1489' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2695'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2674'/>
+          <typedef-decl name='reference' type-id='type-id-1487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2696'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-121' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-134' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-121' is-artificial='yes'/>
-            <parameter type-id='type-id-203'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-134' is-artificial='yes'/>
+            <parameter type-id='type-id-216'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-121' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-134' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-122'>
+      <class-decl name='new_allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-135'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-2615' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2676'/>
+          <typedef-decl name='const_pointer' type-id='type-id-2636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2698'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2677'/>
+          <typedef-decl name='const_reference' type-id='type-id-2635' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2699'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2678'/>
+          <typedef-decl name='pointer' type-id='type-id-2638' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2700'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2616' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2679'/>
+          <typedef-decl name='reference' type-id='type-id-2637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2701'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-123' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-136' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-123' is-artificial='yes'/>
-            <parameter type-id='type-id-206'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-136' is-artificial='yes'/>
+            <parameter type-id='type-id-219'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-123' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-136' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-124'>
+      <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-137'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-444' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2680'/>
+          <typedef-decl name='const_pointer' type-id='type-id-456' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2702'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-443' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2681'/>
+          <typedef-decl name='const_reference' type-id='type-id-455' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2703'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1506' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2682'/>
+          <typedef-decl name='pointer' type-id='type-id-1519' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2704'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2683'/>
+          <typedef-decl name='reference' type-id='type-id-1518' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2705'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2Ev'>
-            <parameter type-id='type-id-125' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-138' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2ERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEEC2ERKS5_'>
-            <parameter type-id='type-id-125' is-artificial='yes'/>
-            <parameter type-id='type-id-209'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-138' is-artificial='yes'/>
+            <parameter type-id='type-id-222'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEED2Ev'>
-            <parameter type-id='type-id-125' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-138' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE7destroyIS4_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE7destroyIS4_EEvPT_'>
-            <parameter type-id='type-id-125' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-138' is-artificial='yes'/>
+            <parameter type-id='type-id-1519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE9constructIS4_JPS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo4repl19ReplicationExecutor5EventEE9constructIS4_JPS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_'>
-            <parameter type-id='type-id-125' is-artificial='yes'/>
-            <parameter type-id='type-id-1506'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-138' is-artificial='yes'/>
+            <parameter type-id='type-id-1519'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-126'>
+      <class-decl name='new_allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-139'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-448' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2684'/>
+          <typedef-decl name='const_pointer' type-id='type-id-460' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2706'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-447' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2685'/>
+          <typedef-decl name='const_reference' type-id='type-id-459' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2707'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1509' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2686'/>
+          <typedef-decl name='pointer' type-id='type-id-1522' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2708'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2687'/>
+          <typedef-decl name='reference' type-id='type-id-1520' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2709'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-140' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-140' is-artificial='yes'/>
+            <parameter type-id='type-id-225'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-127' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-140' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-128'>
+      <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-141'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-660' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2688'/>
+          <typedef-decl name='const_pointer' type-id='type-id-672' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2710'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-659' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2689'/>
+          <typedef-decl name='const_reference' type-id='type-id-671' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2711'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1709' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2690'/>
+          <typedef-decl name='pointer' type-id='type-id-1722' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2712'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1708' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2691'/>
+          <typedef-decl name='reference' type-id='type-id-1721' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2713'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEEC2Ev'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <parameter type-id='type-id-215'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <parameter type-id='type-id-228'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEED2Ev'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE7destroyIS6_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE7destroyIS6_EEvPT_'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <parameter type-id='type-id-1709'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <parameter type-id='type-id-1722'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE10deallocateEPS6_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE10deallocateEPS6_m'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <parameter type-id='type-id-2690'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <parameter type-id='type-id-2712'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE9constructIS6_JEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE9constructIS6_JEEEvPT_DpOT0_'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <parameter type-id='type-id-1709'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <parameter type-id='type-id-1722'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE8allocateEmPKv'>
-            <parameter type-id='type-id-129' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-2690'/>
+            <parameter type-id='type-id-142' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-2712'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEE8max_sizeEv'>
-            <parameter type-id='type-id-216' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-229' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-130'>
+      <class-decl name='new_allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-143'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-664' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2692'/>
+          <typedef-decl name='const_pointer' type-id='type-id-676' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2714'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-663' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2693'/>
+          <typedef-decl name='const_reference' type-id='type-id-675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2715'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1711' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2694'/>
+          <typedef-decl name='pointer' type-id='type-id-1724' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2716'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1710' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2695'/>
+          <typedef-decl name='reference' type-id='type-id-1723' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2717'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEEC2Ev'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <parameter type-id='type-id-218'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <parameter type-id='type-id-231'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEED2Ev'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;, mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE9constructIS6_JS5_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE9constructIS6_JS5_EEEvPT_DpOT0_'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <parameter type-id='type-id-1711'/>
-            <parameter type-id='type-id-1508'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <parameter type-id='type-id-1724'/>
+            <parameter type-id='type-id-1521'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE10deallocateEPS6_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE10deallocateEPS6_m'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <parameter type-id='type-id-2694'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <parameter type-id='type-id-2716'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE8allocateEmPKv'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-2694'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-2716'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE8max_sizeEv'>
-            <parameter type-id='type-id-219' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-232' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE7destroyIS6_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEE7destroyIS6_EEvPT_'>
-            <parameter type-id='type-id-131' is-artificial='yes'/>
-            <parameter type-id='type-id-1711'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-144' is-artificial='yes'/>
+            <parameter type-id='type-id-1724'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-132'>
+      <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-145'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2696'/>
+          <typedef-decl name='const_pointer' type-id='type-id-702' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2718'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-689' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2697'/>
+          <typedef-decl name='const_reference' type-id='type-id-701' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2719'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1730' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2698'/>
+          <typedef-decl name='pointer' type-id='type-id-1743' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2720'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2699'/>
+          <typedef-decl name='reference' type-id='type-id-1742' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2721'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEEC2Ev'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-221'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <parameter type-id='type-id-234'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEED2Ev'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE10deallocateEPS8_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE10deallocateEPS8_m'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-2698'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <parameter type-id='type-id-2720'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE9constructIS8_JKS6_PS4_RSt14_List_iteratorINS2_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE9constructIS8_JKS6_PS4_RSt14_List_iteratorINS2_8executor12TaskExecutor11EventHandleEEEEEvPT_DpOT0_'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-1730'/>
-            <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <parameter type-id='type-id-1743'/>
+            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE7destroyIS8_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE7destroyIS8_EEvPT_'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-1730'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <parameter type-id='type-id-1743'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE8allocateEmPKv'>
-            <parameter type-id='type-id-133' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-2698'/>
+            <parameter type-id='type-id-146' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-2720'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS5_ELNS_12_Lock_policyE2EEE8max_sizeEv'>
-            <parameter type-id='type-id-222' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-235' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-134'>
+      <class-decl name='new_allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-147'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-694' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2700'/>
+          <typedef-decl name='const_pointer' type-id='type-id-706' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2722'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-693' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2701'/>
+          <typedef-decl name='const_reference' type-id='type-id-705' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2723'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1734' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2702'/>
+          <typedef-decl name='pointer' type-id='type-id-1747' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2724'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1733' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2703'/>
+          <typedef-decl name='reference' type-id='type-id-1746' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2725'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-224'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <parameter type-id='type-id-237'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEE10deallocateEPSE_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-2702'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <parameter type-id='type-id-2724'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEE9constructISE_JKSC_SA_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-1734'/>
-            <parameter type-id='type-id-1074'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <parameter type-id='type-id-1747'/>
+            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEE7destroyISE_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-1734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <parameter type-id='type-id-1747'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-135' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-2702'/>
+            <parameter type-id='type-id-148' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-2724'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISB_ELNS_12_Lock_policyE2EEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-225' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-238' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-136'>
+      <class-decl name='new_allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-149'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-954' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2704'/>
+          <typedef-decl name='const_pointer' type-id='type-id-966' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2726'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-953' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2705'/>
+          <typedef-decl name='const_reference' type-id='type-id-965' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2727'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1940' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2706'/>
+          <typedef-decl name='pointer' type-id='type-id-1953' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2728'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2707'/>
+          <typedef-decl name='reference' type-id='type-id-1952' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2729'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-137' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-150' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-137' is-artificial='yes'/>
-            <parameter type-id='type-id-227'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-150' is-artificial='yes'/>
+            <parameter type-id='type-id-240'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-137' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-150' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-138'>
+      <class-decl name='new_allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-151'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-1191' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2708'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1203' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2730'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-1190' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2709'/>
+          <typedef-decl name='const_reference' type-id='type-id-1202' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2731'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2710'/>
+          <typedef-decl name='pointer' type-id='type-id-2126' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2732'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2111' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2711'/>
+          <typedef-decl name='reference' type-id='type-id-2124' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2733'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-139' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-152' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-139' is-artificial='yes'/>
-            <parameter type-id='type-id-230'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-152' is-artificial='yes'/>
+            <parameter type-id='type-id-243'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-139' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-152' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-140'>
+      <class-decl name='new_allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-153'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-1218' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2712'/>
+          <typedef-decl name='const_pointer' type-id='type-id-1230' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-2734'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-1217' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2713'/>
+          <typedef-decl name='const_reference' type-id='type-id-1229' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-2735'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2350' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2714'/>
+          <typedef-decl name='pointer' type-id='type-id-2369' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-2736'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2349' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2715'/>
+          <typedef-decl name='reference' type-id='type-id-2368' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-2737'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-141' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEC2ERKSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-141' is-artificial='yes'/>
-            <parameter type-id='type-id-233'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <parameter type-id='type-id-246'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-141' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEE7destroyISA_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-141' is-artificial='yes'/>
-            <parameter type-id='type-id-2350'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <parameter type-id='type-id-2369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEE9constructISA_JS9_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-141' is-artificial='yes'/>
-            <parameter type-id='type-id-2350'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <parameter type-id='type-id-2369'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__aligned_buffer&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-114'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2716'/>
+      <class-decl name='__aligned_buffer&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='768' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-127'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2738'/>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_storage' type-id='type-id-2717' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
+          <var-decl name='_M_storage' type-id='type-id-2739' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE6_M_ptrEv'>
-            <parameter type-id='type-id-115' is-artificial='yes'/>
-            <return type-id='type-id-1506'/>
+            <parameter type-id='type-id-128' is-artificial='yes'/>
+            <return type-id='type-id-1519'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_addr' mangled-name='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE7_M_addrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx16__aligned_bufferIN5mongo4repl19ReplicationExecutor5EventEE7_M_addrEv'>
-            <parameter type-id='type-id-115' is-artificial='yes'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-128' is-artificial='yes'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__aligned_buffer&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-116'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2718'/>
+      <class-decl name='__aligned_buffer&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-129'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2740'/>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_storage' type-id='type-id-2719' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
+          <var-decl name='_M_storage' type-id='type-id-2741' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__aligned_buffer&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-118'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2720'/>
+      <class-decl name='__aligned_buffer&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='43' column='1' id='type-id-131'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2742'/>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_storage' type-id='type-id-2721' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
+          <var-decl name='_M_storage' type-id='type-id-2743' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='48' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZN9__gnu_cxx16__aligned_bufferINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-119' is-artificial='yes'/>
-            <return type-id='type-id-2350'/>
+            <parameter type-id='type-id-132' is-artificial='yes'/>
+            <return type-id='type-id-2369'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_addr' mangled-name='_ZN9__gnu_cxx16__aligned_bufferINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEE7_M_addrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/aligned_buffer.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-119' is-artificial='yes'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-132' is-artificial='yes'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2722'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2723'/>
+      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-2744'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2745'/>
         <member-type access='public'>
-          <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2724'>
+          <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-2746'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-2726' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2725'/>
+              <typedef-decl name='other' type-id='type-id-2748' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-2747'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-2518' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2727'/>
+          <typedef-decl name='const_reference' type-id='type-id-2539' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-2749'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2729' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2728'/>
+          <typedef-decl name='pointer' type-id='type-id-2751' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-2750'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-2514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2730'/>
+          <typedef-decl name='reference' type-id='type-id-2535' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-2752'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2630' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-2513'/>
+          <typedef-decl name='value_type' type-id='type-id-2652' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-2534'/>
         </member-type>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2731'/>
-      <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2732'/>
+      <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2753'/>
+      <class-decl name='__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2754'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-462'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2733'/>
+      <class-decl name='_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-474'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2755'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-474' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-486' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='448'>
-          <var-decl name='_M_bound_args' type-id='type-id-1231' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1243' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2ERKSV_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2ERKSV_'>
-            <parameter type-id='type-id-1521' is-artificial='yes'/>
-            <parameter type-id='type-id-464'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-476'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2EOSV_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2EOSV_'>
-            <parameter type-id='type-id-1521' is-artificial='yes'/>
-            <parameter type-id='type-id-1520'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-1533'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2IJRS5_S8_EEERKST_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEC2IJRS5_S8_EEERKST_DpOT_'>
-            <parameter type-id='type-id-1521' is-artificial='yes'/>
-            <parameter type-id='type-id-476'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-488'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEclIJEvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EEclIJEvEET0_DpOT_'>
-            <parameter type-id='type-id-1521' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0, 1&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EE6__callIvJEJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEES5_S6_EE6__callIvJEJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1521' is-artificial='yes'/>
-            <parameter type-id='type-id-2362'/>
-            <parameter type-id='type-id-2734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1534' is-artificial='yes'/>
+            <parameter type-id='type-id-2381'/>
+            <parameter type-id='type-id-2756'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-465'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2735'/>
+      <class-decl name='_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-477'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2757'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-477' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-489' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='448'>
-          <var-decl name='_M_bound_args' type-id='type-id-1231' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1243' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2ERKSV_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2ERKSV_'>
-            <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-467'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <parameter type-id='type-id-479'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2EOSV_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2EOSV_'>
-            <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-1526'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <parameter type-id='type-id-1539'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2IJRS5_S8_EEERKST_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEC2IJRS5_S8_EEERKST_DpOT_'>
-            <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-479'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <parameter type-id='type-id-491'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEclIJEvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EEclIJEvEET0_DpOT_'>
-            <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0, 1&gt;' mangled-name='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EE6__callIvJEJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFS_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EES5_S6_EE6__callIvJEJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1527' is-artificial='yes'/>
-            <parameter type-id='type-id-2362'/>
-            <parameter type-id='type-id-2734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1540' is-artificial='yes'/>
+            <parameter type-id='type-id-2381'/>
+            <parameter type-id='type-id-2756'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-468'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2736'/>
+      <class-decl name='_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-480'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2758'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-665' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-677' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-1252' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1264' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <parameter type-id='type-id-470'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-482'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEC2EOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEC2EOSB_'>
-            <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <parameter type-id='type-id-1532'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1545'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEC2IJRS9_EEEOS8_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEC2IJRS9_EEEOS8_DpOT_'>
-            <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <parameter type-id='type-id-1713'/>
-            <parameter type-id='type-id-2625'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-1726'/>
+            <parameter type-id='type-id-2646'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, mongo::OperationContext *&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEclIJES5_EET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EEclIJES5_EET0_DpOT_'>
-            <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <return type-id='type-id-2590'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <return type-id='type-id-2611'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;mongo::OperationContext *, 0&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EE6__callIS5_JEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEPS3_EE6__callIS5_JEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1533' is-artificial='yes'/>
-            <parameter type-id='type-id-2362'/>
-            <parameter type-id='type-id-2737'/>
-            <return type-id='type-id-2590'/>
+            <parameter type-id='type-id-1546' is-artificial='yes'/>
+            <parameter type-id='type-id-2381'/>
+            <parameter type-id='type-id-2759'/>
+            <return type-id='type-id-2611'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt;' size-in-bits='1216' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-471'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2738'/>
+      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt;' size-in-bits='1216' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-483'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2760'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-668' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-680' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-1240' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1252' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2ERKSW_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2ERKSW_'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-473'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1552' is-artificial='yes'/>
+            <parameter type-id='type-id-485'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2EOSW_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2EOSW_'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-1538'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1552' is-artificial='yes'/>
+            <parameter type-id='type-id-1551'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2IJSS_RS5_RKSU_RSE_RmSO_EEEOSR_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEC2IJSS_RS5_RKSU_RSE_RmSO_EEEOSR_DpOT_'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-1716'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1552' is-artificial='yes'/>
+            <parameter type-id='type-id-1729'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEclIJSC_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EEclIJSC_EvEET0_DpOT_'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1552' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, 0, 1, 2, 3, 4, 5&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EE6__callIvJSC_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEPS3_S5_St12_PlaceholderILi1EESE_mSM_EE6__callIvJSC_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1539' is-artificial='yes'/>
-            <parameter type-id='type-id-2365'/>
-            <parameter type-id='type-id-2739'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1552' is-artificial='yes'/>
+            <parameter type-id='type-id-2384'/>
+            <parameter type-id='type-id-2761'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-474'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2740'/>
+      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-486'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2762'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-671' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-683' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-1243' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1255' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2ERKST_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2ERKST_'>
-            <parameter type-id='type-id-1545' is-artificial='yes'/>
-            <parameter type-id='type-id-476'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-488'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2EOST_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2EOST_'>
-            <parameter type-id='type-id-1545' is-artificial='yes'/>
-            <parameter type-id='type-id-1544'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-1557'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2IJSO_RKSQ_RKSR_RSB_SI_DnEEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEC2IJSO_RKSQ_RKSR_RSB_SI_DnEEEOSN_DpOT_'>
-            <parameter type-id='type-id-1545' is-artificial='yes'/>
-            <parameter type-id='type-id-1719'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-1732'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEclIJRS5_RS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEEclIJRS5_RS6_EvEET0_DpOT_'>
-            <parameter type-id='type-id-1545' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, mongo::OperationContext *&amp;, mongo::Status &amp;, 0, 1, 2, 3, 4, 5&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEE6__callIvJRS5_RS6_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_DnEE6__callIvJRS5_RS6_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1545' is-artificial='yes'/>
-            <parameter type-id='type-id-2371'/>
-            <parameter type-id='type-id-2739'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1558' is-artificial='yes'/>
+            <parameter type-id='type-id-2390'/>
+            <parameter type-id='type-id-2761'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-477'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2740'/>
+      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-489'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2762'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-671' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-683' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-1246' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1258' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2ERKST_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2ERKST_'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-479'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1561' is-artificial='yes'/>
+            <parameter type-id='type-id-491'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2EOST_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2EOST_'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1547'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1561' is-artificial='yes'/>
+            <parameter type-id='type-id-1560'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2IJSO_RKSQ_RKSR_RSB_SI_SK_EEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEC2IJSO_RKSQ_RKSR_RSB_SI_SK_EEEOSN_DpOT_'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-1719'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1561' is-artificial='yes'/>
+            <parameter type-id='type-id-1732'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEclIJRS5_RS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EEclIJRS5_RS6_EvEET0_DpOT_'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1561' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, mongo::OperationContext *&amp;, mongo::Status &amp;, 0, 1, 2, 3, 4, 5&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EE6__callIvJRS5_RS6_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEPS3_St12_PlaceholderILi1EESP_ILi2EESB_SI_SK_EE6__callIvJRS5_RS6_EJLm0ELm1ELm2ELm3ELm4ELm5EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1548' is-artificial='yes'/>
-            <parameter type-id='type-id-2371'/>
-            <parameter type-id='type-id-2739'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1561' is-artificial='yes'/>
+            <parameter type-id='type-id-2390'/>
+            <parameter type-id='type-id-2761'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-480'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2741'/>
+      <class-decl name='_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt;' size-in-bits='576' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-492'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2763'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-1141' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-1153' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='_M_bound_args' type-id='type-id-1237' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2ERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2ERKSA_'>
-            <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-482'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <parameter type-id='type-id-494'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2EOSA_'>
-            <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1550'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <parameter type-id='type-id-1563'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2IJS4_EEERKS8_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEC2IJS4_EEERKS8_DpOT_'>
-            <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-1143'/>
-            <parameter type-id='type-id-1469'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <parameter type-id='type-id-1155'/>
+            <parameter type-id='type-id-1482'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEclIJEvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EEclIJEvEET0_DpOT_'>
-            <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0&gt;' mangled-name='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES4_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1551' is-artificial='yes'/>
-            <parameter type-id='type-id-2362'/>
-            <parameter type-id='type-id-2737'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1564' is-artificial='yes'/>
+            <parameter type-id='type-id-2381'/>
+            <parameter type-id='type-id-2759'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-483'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2742'/>
+      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-495'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2764'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2451' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2470' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-1258' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1270' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2ERKSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2ERKSM_'>
-            <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-485'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1570' is-artificial='yes'/>
+            <parameter type-id='type-id-497'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2EOSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2EOSM_'>
-            <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-1556'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1570' is-artificial='yes'/>
+            <parameter type-id='type-id-1569'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2IJRKSK_SD_RSE_EEEOSI_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEC2IJRKSK_SD_RSE_EEEOSI_DpOT_'>
-            <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-2455'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1570' is-artificial='yes'/>
+            <parameter type-id='type-id-2474'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, void&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEclIJS5_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EEclIJS5_EvEET0_DpOT_'>
-            <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1570' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::executor::TaskExecutor::CallbackArgs &amp;, 0, 1, 2&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EE6__callIvJS5_EJLm0ELm1ELm2EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESB_SE_EE6__callIvJS5_EJLm0ELm1ELm2EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1557' is-artificial='yes'/>
-            <parameter type-id='type-id-2368'/>
-            <parameter type-id='type-id-2743'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1570' is-artificial='yes'/>
+            <parameter type-id='type-id-2387'/>
+            <parameter type-id='type-id-2765'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='1344' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-486'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2744'/>
+      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='1344' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-498'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2766'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2457' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2476' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-1255' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1267' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2ERKSR_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2ERKSR_'>
-            <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-488'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1576' is-artificial='yes'/>
+            <parameter type-id='type-id-500'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2EOSR_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2EOSR_'>
-            <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-1562'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1576' is-artificial='yes'/>
+            <parameter type-id='type-id-1575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2IJRKSP_SD_SG_SL_EEEOSN_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEC2IJRKSP_SD_SG_SL_EEEOSN_DpOT_'>
-            <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-2461'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1576' is-artificial='yes'/>
+            <parameter type-id='type-id-2480'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, void&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEclIJS5_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EEclIJS5_EvEET0_DpOT_'>
-            <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1576' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::executor::TaskExecutor::CallbackArgs &amp;, 0, 1, 2, 3&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EE6__callIvJS5_EJLm0ELm1ELm2ELm3EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESB_SE_SJ_EE6__callIvJS5_EJLm0ELm1ELm2ELm3EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1563' is-artificial='yes'/>
-            <parameter type-id='type-id-2368'/>
-            <parameter type-id='type-id-2745'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1576' is-artificial='yes'/>
+            <parameter type-id='type-id-2387'/>
+            <parameter type-id='type-id-2767'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-489'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2746'/>
+      <class-decl name='_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-501'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2768'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-2474' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-2493' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-1264' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-1276' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2ERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2ERKS8_'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-491'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1582' is-artificial='yes'/>
+            <parameter type-id='type-id-503'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2EOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2EOS8_'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-1568'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1582' is-artificial='yes'/>
+            <parameter type-id='type-id-1581'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2IJS4_EEEOS6_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEC2IJS4_EEEOS6_DpOT_'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-2478'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1582' is-artificial='yes'/>
+            <parameter type-id='type-id-2497'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEclIJEvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EEclIJEvEET0_DpOT_'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1582' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0&gt;' mangled-name='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKSt8functionIFvvEEES2_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-1569' is-artificial='yes'/>
-            <parameter type-id='type-id-2362'/>
-            <parameter type-id='type-id-2737'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1582' is-artificial='yes'/>
+            <parameter type-id='type-id-2381'/>
+            <parameter type-id='type-id-2759'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1837' column='1' id='type-id-495'>
+      <class-decl name='_Function_base' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1837' column='1' id='type-id-507'>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2747'>
+          <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2769'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E21_M_not_empty_functionISI_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5100,52 +5113,52 @@
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E15_M_init_functorERSt9_Any_dataOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E10_M_managerERSt9_Any_dataRKSK_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E8_M_cloneERSt9_Any_dataRKSK_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEERKNS1_15NamespaceStringENS1_8LockModeEE3$_1E15_M_init_functorERSt9_Any_dataOSI_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2750'>
+          <class-decl name='_Base_manager&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2772'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E21_M_not_empty_functionISE_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5154,5333 +5167,5354 @@
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E15_M_init_functorERSt9_Any_dataOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E10_M_managerERSt9_Any_dataRKSG_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E8_M_cloneERSt9_Any_dataRKSG_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerIZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS1_8executor12TaskExecutor12CallbackArgsEEEE3$_2E15_M_init_functorERSt9_Any_dataOSE_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2751'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2773'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE21_M_not_empty_functionISX_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE21_M_not_empty_functionISX_EEbRKT_'>
-                <parameter type-id='type-id-464'/>
+                <parameter type-id='type-id-476'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1520'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1533'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE10_M_managerERSt9_Any_dataRKSZ_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE10_M_managerERSt9_Any_dataRKSZ_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1521'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1534'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE8_M_cloneERSt9_Any_dataRKSZ_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE8_M_cloneERSt9_Any_dataRKSZ_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1520'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1533'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2752'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2774'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE21_M_not_empty_functionISX_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE21_M_not_empty_functionISX_EEbRKT_'>
-                <parameter type-id='type-id-467'/>
+                <parameter type-id='type-id-479'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1526'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1539'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE10_M_managerERSt9_Any_dataRKSZ_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE10_M_managerERSt9_Any_dataRKSZ_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1527'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1540'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE8_M_cloneERSt9_Any_dataRKSZ_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE8_M_cloneERSt9_Any_dataRKSZ_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE15_M_init_functorERSt9_Any_dataOSX_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1526'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1539'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2753'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2775'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE21_M_not_empty_functionISD_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE21_M_not_empty_functionISD_EEbRKT_'>
-                <parameter type-id='type-id-470'/>
+                <parameter type-id='type-id-482'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE15_M_init_functorERSt9_Any_dataOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE15_M_init_functorERSt9_Any_dataOSD_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1532'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1545'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE10_M_managerERSt9_Any_dataRKSF_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE10_M_managerERSt9_Any_dataRKSF_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1533'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1546'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE8_M_cloneERSt9_Any_dataRKSF_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE8_M_cloneERSt9_Any_dataRKSF_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE15_M_init_functorERSt9_Any_dataOSD_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEE15_M_init_functorERSt9_Any_dataOSD_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1532'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1545'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2754'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2776'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE21_M_not_empty_functionISY_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE21_M_not_empty_functionISY_EEbRKT_'>
-                <parameter type-id='type-id-473'/>
+                <parameter type-id='type-id-485'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE15_M_init_functorERSt9_Any_dataOSY_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE15_M_init_functorERSt9_Any_dataOSY_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1538'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1551'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE10_M_managerERSt9_Any_dataRKS10_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE10_M_managerERSt9_Any_dataRKS10_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1539'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1552'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE8_M_cloneERSt9_Any_dataRKS10_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE8_M_cloneERSt9_Any_dataRKS10_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE15_M_init_functorERSt9_Any_dataOSY_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEE15_M_init_functorERSt9_Any_dataOSY_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1538'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1551'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2755'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2777'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE21_M_not_empty_functionISC_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE21_M_not_empty_functionISC_EEbRKT_'>
-                <parameter type-id='type-id-482'/>
+                <parameter type-id='type-id-494'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE15_M_init_functorERSt9_Any_dataOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE15_M_init_functorERSt9_Any_dataOSC_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1550'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1563'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE10_M_managerERSt9_Any_dataRKSE_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE10_M_managerERSt9_Any_dataRKSE_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1551'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1564'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE8_M_cloneERSt9_Any_dataRKSE_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE8_M_cloneERSt9_Any_dataRKSE_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE15_M_init_functorERSt9_Any_dataOSC_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE15_M_init_functorERSt9_Any_dataOSC_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1550'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1563'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2756'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2778'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE21_M_not_empty_functionISG_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE21_M_not_empty_functionISG_EEbRKT_'>
-                <parameter type-id='type-id-2757'/>
+                <parameter type-id='type-id-2779'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE15_M_init_functorERSt9_Any_dataOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE15_M_init_functorERSt9_Any_dataOSG_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2758'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2780'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE10_M_managerERSt9_Any_dataRKSI_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE10_M_managerERSt9_Any_dataRKSI_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-2759'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-2781'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE8_M_cloneERSt9_Any_dataRKSI_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE8_M_cloneERSt9_Any_dataRKSI_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE15_M_init_functorERSt9_Any_dataOSG_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE15_M_init_functorERSt9_Any_dataOSG_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2758'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2780'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2760'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2782'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE21_M_not_empty_functionISK_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE21_M_not_empty_functionISK_EEbRKT_'>
-                <parameter type-id='type-id-2761'/>
+                <parameter type-id='type-id-2783'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE15_M_init_functorERSt9_Any_dataOSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE15_M_init_functorERSt9_Any_dataOSK_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2762'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2784'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE10_M_managerERSt9_Any_dataRKSM_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE10_M_managerERSt9_Any_dataRKSM_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-2763'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-2785'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE8_M_cloneERSt9_Any_dataRKSM_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE8_M_cloneERSt9_Any_dataRKSM_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE15_M_init_functorERSt9_Any_dataOSK_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE15_M_init_functorERSt9_Any_dataOSK_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2762'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2784'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2764'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2786'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE21_M_not_empty_functionISO_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE21_M_not_empty_functionISO_EEbRKT_'>
-                <parameter type-id='type-id-485'/>
+                <parameter type-id='type-id-497'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE15_M_init_functorERSt9_Any_dataOSO_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE15_M_init_functorERSt9_Any_dataOSO_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1556'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1569'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE10_M_managerERSt9_Any_dataRKSQ_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE10_M_managerERSt9_Any_dataRKSQ_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1557'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1570'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE8_M_cloneERSt9_Any_dataRKSQ_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE8_M_cloneERSt9_Any_dataRKSQ_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE15_M_init_functorERSt9_Any_dataOSO_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE15_M_init_functorERSt9_Any_dataOSO_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1556'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1569'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2765'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2787'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE21_M_not_empty_functionIST_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE21_M_not_empty_functionIST_EEbRKT_'>
-                <parameter type-id='type-id-488'/>
+                <parameter type-id='type-id-500'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE15_M_init_functorERSt9_Any_dataOST_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE15_M_init_functorERSt9_Any_dataOST_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1562'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1575'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE10_M_managerERSt9_Any_dataRKSV_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE10_M_managerERSt9_Any_dataRKSV_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1563'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1576'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE8_M_cloneERSt9_Any_dataRKSV_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE8_M_cloneERSt9_Any_dataRKSV_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE15_M_init_functorERSt9_Any_dataOST_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE15_M_init_functorERSt9_Any_dataOST_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1562'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1575'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2766'>
+          <class-decl name='_Base_manager&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1844' column='1' id='type-id-2788'>
             <data-member access='protected' static='yes'>
-              <var-decl name='__stored_locally' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
+              <var-decl name='__stored_locally' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1847' column='1'/>
             </data-member>
             <member-function access='public' static='yes'>
               <function-decl name='_M_not_empty_function&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &gt;' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE21_M_not_empty_functionISA_EEbRKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE21_M_not_empty_functionISA_EEbRKT_'>
-                <parameter type-id='type-id-491'/>
+                <parameter type-id='type-id-503'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE15_M_init_functorERSt9_Any_dataOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1925' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE15_M_init_functorERSt9_Any_dataOSA_'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1568'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1581'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='_M_manager' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE10_M_managerERSt9_Any_dataRKSC_St18_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE10_M_managerERSt9_Any_dataRKSC_St18_Manager_operation'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2748'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2770'/>
                 <return type-id='type-id-1'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_get_pointer' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE14_M_get_pointerERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1857' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE14_M_get_pointerERKSt9_Any_data'>
-                <parameter type-id='type-id-460'/>
-                <return type-id='type-id-1569'/>
+                <parameter type-id='type-id-472'/>
+                <return type-id='type-id-1582'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_clone' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE8_M_cloneERSt9_Any_dataRKSC_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE8_M_cloneERSt9_Any_dataRKSC_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-460'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-472'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_M_destroy' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE10_M_destroyERSt9_Any_dataSt17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='private' static='yes'>
               <function-decl name='_M_init_functor' mangled-name='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE15_M_init_functorERSt9_Any_dataOSA_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_base13_Base_managerISt5_BindIFPFvRKSt8functionIFvvEEES4_EEE15_M_init_functorERSt9_Any_dataOSA_St17integral_constantIbLb0EE'>
-                <parameter type-id='type-id-1517'/>
-                <parameter type-id='type-id-1568'/>
-                <parameter type-id='type-id-2749'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1530'/>
+                <parameter type-id='type-id-1581'/>
+                <parameter type-id='type-id-2771'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Manager_type' type-id='type-id-144' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2004' column='1' id='type-id-2767'/>
+          <typedef-decl name='_Manager_type' type-id='type-id-157' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2004' column='1' id='type-id-2789'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_size' type-id='type-id-1210' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1840' column='1'/>
+          <var-decl name='_M_max_size' type-id='type-id-1222' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1840' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='_M_max_align' type-id='type-id-1210' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1841' column='1'/>
+          <var-decl name='_M_max_align' type-id='type-id-1222' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1841' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_functor' type-id='type-id-458' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2007' column='1'/>
+          <var-decl name='_M_functor' type-id='type-id-470' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2007' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_manager' type-id='type-id-2767' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2008' column='1'/>
+          <var-decl name='_M_manager' type-id='type-id-2789' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2008' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Function_base' mangled-name='_ZNSt14_Function_baseC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_baseC2Ev'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1588' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Function_base' mangled-name='_ZNSt14_Function_baseD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Function_baseD2Ev'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1588' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_empty' mangled-name='_ZNKSt14_Function_base8_M_emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2002' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_Function_base8_M_emptyEv'>
-            <parameter type-id='type-id-497' is-artificial='yes'/>
+            <parameter type-id='type-id-509' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Function_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1993' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1588' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Function_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1995' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1575' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1588' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;mongo::OperationContext *(), std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2768'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2753'/>
+      <class-decl name='_Function_handler&lt;mongo::OperationContext *(), std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2790'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2775'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFPN5mongo16OperationContextEvESt5_BindIFSt7_Mem_fnIMNS0_4repl16StorageInterfaceEFS2_vEEPS7_EEE9_M_invokeERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2022' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFPN5mongo16OperationContextEvESt5_BindIFSt7_Mem_fnIMNS0_4repl16StorageInterfaceEFS2_vEEPS7_EEE9_M_invokeERKSt9_Any_data'>
-            <parameter type-id='type-id-460'/>
-            <return type-id='type-id-2590'/>
+            <parameter type-id='type-id-472'/>
+            <return type-id='type-id-2611'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;), (lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2769'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2747'/>
+      <class-decl name='_Function_handler&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;), (lambda at src/mongo/db/repl/replication_executor.cpp:357:21)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2791'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2769'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFN5mongo4repl10TaskRunner10NextActionEPNS0_16OperationContextERKNS0_6StatusEEZNS1_19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS0_8executor12TaskExecutor12CallbackArgsEEERKNS0_15NamespaceStringENS0_8LockModeEE3$_1E9_M_invokeERKSt9_Any_dataS5_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2022' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-2590'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2770'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-2611'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2792'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;), (lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2771'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2750'/>
+      <class-decl name='_Function_handler&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;), (lambda at src/mongo/db/repl/replication_executor.cpp:413:13)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2015' column='1' id='type-id-2793'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2772'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFN5mongo4repl10TaskRunner10NextActionEPNS0_16OperationContextERKNS0_6StatusEEZNS1_19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS0_8executor12TaskExecutor12CallbackArgsEEEE3$_2E9_M_invokeERKSt9_Any_dataS5_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2022' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-2590'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2770'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-2611'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2792'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2772'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2751'/>
+      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2794'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2773'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvvESt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE9_M_invokeERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvvESt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEE9_M_invokeERKSt9_Any_data'>
-            <parameter type-id='type-id-460'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2773'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2752'/>
+      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2795'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2774'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvvESt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE9_M_invokeERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvvESt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEE9_M_invokeERKSt9_Any_data'>
-            <parameter type-id='type-id-460'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2774'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2755'/>
+      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2796'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2777'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvvESt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE9_M_invokeERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvvESt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEE9_M_invokeERKSt9_Any_data'>
-            <parameter type-id='type-id-460'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2775'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2766'/>
+      <class-decl name='_Function_handler&lt;void (), std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2797'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2788'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvvESt5_BindIFPFvRKSt8functionIS0_EES3_EEE9_M_invokeERKSt9_Any_data' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvvESt5_BindIFPFvRKSt8functionIS0_EES3_EEE9_M_invokeERKSt9_Any_data'>
-            <parameter type-id='type-id-460'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2776'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2754'/>
+      <class-decl name='_Function_handler&lt;void (const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2798'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2776'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEESt5_BindIFSt7_Mem_fnIMNS0_4repl19ReplicationExecutorEFvRKNS2_20RemoteCommandRequestES6_RKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPSB_SC_St12_PlaceholderILi1EESG_mSO_EEE9_M_invokeERKSt9_Any_dataS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEESt5_BindIFSt7_Mem_fnIMNS0_4repl19ReplicationExecutorEFvRKNS2_20RemoteCommandRequestES6_RKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPSB_SC_St12_PlaceholderILi1EESG_mSO_EEE9_M_invokeERKSt9_Any_dataS6_'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2777'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2764'/>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2799'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2786'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_RKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_RKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEE9_M_invokeERKSt9_Any_dataS5_'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2778'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2765'/>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-2800'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2787'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_RKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_RKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEE9_M_invokeERKSt9_Any_dataS5_'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Hashtable&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-498'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-965'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-989'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2779'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1003'/>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-939'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-958'/>
+      <class-decl name='_Hashtable&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='170' column='1' id='type-id-510'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-977'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1001'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2801'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1015'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-970'/>
         <member-type access='private'>
-          <typedef-decl name='__bucket_type' type-id='type-id-62' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1579'/>
+          <typedef-decl name='__bucket_type' type-id='type-id-67' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='199' column='1' id='type-id-1592'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__hash_code' type-id='type-id-2781' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-2780'/>
+          <typedef-decl name='__hash_code' type-id='type-id-2803' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='231' column='1' id='type-id-2802'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__hashtable_alloc' type-id='type-id-958' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1581'/>
+          <typedef-decl name='__hashtable_alloc' type-id='type-id-970' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='192' column='1' id='type-id-1594'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__node_base' type-id='type-id-74' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1583'/>
+          <typedef-decl name='__node_base' type-id='type-id-79' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='198' column='1' id='type-id-1596'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__rehash_state' type-id='type-id-2782' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-502'/>
+          <typedef-decl name='__rehash_state' type-id='type-id-2804' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='216' column='1' id='type-id-514'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-1068' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-505'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1080' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='204' column='1' id='type-id-517'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_equal' type-id='type-id-1121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-508'/>
+          <typedef-decl name='key_equal' type-id='type-id-1133' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='205' column='1' id='type-id-520'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-93' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='302' column='1' id='type-id-2783'/>
+          <typedef-decl name='size_type' type-id='type-id-98' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='302' column='1' id='type-id-2805'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-2785' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-2784'/>
+          <typedef-decl name='const_iterator' type-id='type-id-2807' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='306' column='1' id='type-id-2806'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_local_iterator' type-id='type-id-2787' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='309' column='1' id='type-id-2786'/>
+          <typedef-decl name='const_local_iterator' type-id='type-id-2809' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='309' column='1' id='type-id-2808'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-2789' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='305' column='1' id='type-id-2788'/>
+          <typedef-decl name='iterator' type-id='type-id-2811' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='305' column='1' id='type-id-2810'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_type' type-id='type-id-2549' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='202' column='1' id='type-id-2525'/>
+          <typedef-decl name='key_type' type-id='type-id-2570' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='202' column='1' id='type-id-2546'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='local_iterator' type-id='type-id-2791' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='308' column='1' id='type-id-2790'/>
+          <typedef-decl name='local_iterator' type-id='type-id-2813' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='308' column='1' id='type-id-2812'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_buckets' type-id='type-id-1580' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='313' column='1'/>
+          <var-decl name='_M_buckets' type-id='type-id-1593' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='313' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bucket_count' type-id='type-id-2783' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
+          <var-decl name='_M_bucket_count' type-id='type-id-2805' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='314' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_before_begin' type-id='type-id-1583' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='315' column='1'/>
+          <var-decl name='_M_before_begin' type-id='type-id-1596' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='315' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_element_count' type-id='type-id-2783' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
+          <var-decl name='_M_element_count' type-id='type-id-2805' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='316' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='_M_rehash_policy' type-id='type-id-999' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
+          <var-decl name='_M_rehash_policy' type-id='type-id-1011' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='317' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='384'>
-          <var-decl name='_M_single_bucket' type-id='type-id-1579' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='325' column='1'/>
+          <var-decl name='_M_single_bucket' type-id='type-id-1592' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='325' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='387' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-2783'/>
-            <parameter type-id='type-id-1151'/>
-            <parameter type-id='type-id-997'/>
-            <parameter type-id='type-id-2530'/>
-            <parameter type-id='type-id-1123'/>
-            <parameter type-id='type-id-1008'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-2805'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-1009'/>
+            <parameter type-id='type-id-2551'/>
+            <parameter type-id='type-id-1135'/>
+            <parameter type-id='type-id-1020'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-500'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-512'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='401' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-1577'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-1590'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='403' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-500'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-512'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-1577'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-1590'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='415' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-2783'/>
-            <parameter type-id='type-id-1151'/>
-            <parameter type-id='type-id-510'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-2805'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-522'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <parameter type-id='type-id-2792'/>
-            <parameter type-id='type-id-2783'/>
-            <parameter type-id='type-id-1151'/>
-            <parameter type-id='type-id-510'/>
-            <parameter type-id='type-id-507'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <parameter type-id='type-id-2814'/>
+            <parameter type-id='type-id-2805'/>
+            <parameter type-id='type-id-1163'/>
+            <parameter type-id='type-id-522'/>
+            <parameter type-id='type-id-519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Hashtable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable.h' line='467' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1578' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1591' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-613'>
+      <class-decl name='_List_base&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-625'>
         <member-type access='private'>
-          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1689'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1053'/>
+          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1702'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1065'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_node' type-id='type-id-986' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
+              <var-decl name='_M_node' type-id='type-id-998' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE10_List_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE10_List_implC2Ev'>
-                <parameter type-id='type-id-1690' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1703' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1690' is-artificial='yes'/>
-                <parameter type-id='type-id-618'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1703' is-artificial='yes'/>
+                <parameter type-id='type-id-630'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1690' is-artificial='yes'/>
-                <parameter type-id='type-id-1692'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1703' is-artificial='yes'/>
+                <parameter type-id='type-id-1705'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2793' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-616'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2815' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-628'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2795' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2794'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2817' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2816'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-1040' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1163'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1052' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1175'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1689' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1702' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_base' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <parameter type-id='type-id-618'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <parameter type-id='type-id-630'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <parameter type-id='type-id-1687'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <parameter type-id='type-id-1700'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_List_base' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_clear' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE8_M_clearEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE8_M_clearEv'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE21_M_get_Node_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE21_M_get_Node_allocatorEv'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-1691'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-1704'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE11_M_put_nodeEPSt10_List_nodeIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE11_M_put_nodeEPSt10_List_nodeIS3_E'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <parameter type-id='type-id-1709'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <parameter type-id='type-id-1722'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE11_M_get_nodeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE11_M_get_nodeEv'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-1709'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-1722'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_init' mangled-name='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE7_M_initEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE7_M_initEv'>
-            <parameter type-id='type-id-1688' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1701' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_base&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-619'>
+      <class-decl name='_List_base&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='298' column='1' id='type-id-631'>
         <member-type access='private'>
-          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1695'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1056'/>
+          <class-decl name='_List_impl' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='319' column='1' id='type-id-1708'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1068'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_node' type-id='type-id-986' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
+              <var-decl name='_M_node' type-id='type-id-998' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='322' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE10_List_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE10_List_implC2Ev'>
-                <parameter type-id='type-id-1696' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1709' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1696' is-artificial='yes'/>
-                <parameter type-id='type-id-624'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1709' is-artificial='yes'/>
+                <parameter type-id='type-id-636'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_List_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1696' is-artificial='yes'/>
-                <parameter type-id='type-id-1698'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1709' is-artificial='yes'/>
+                <parameter type-id='type-id-1711'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_alloc_type' type-id='type-id-2796' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-622'/>
+          <typedef-decl name='_Node_alloc_type' type-id='type-id-2818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='315' column='1' id='type-id-634'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2798' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2797'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2820' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='317' column='1' id='type-id-2819'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-1050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1173'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1062' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='350' column='1' id='type-id-1185'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1695' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1708' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='339' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_base' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <parameter type-id='type-id-624'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <parameter type-id='type-id-636'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <parameter type-id='type-id-1693'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <parameter type-id='type-id-1706'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_List_base' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EED2Ev'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_clear' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE8_M_clearEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE8_M_clearEv'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_get_nodeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_get_nodeEv'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-1711'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-1724'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE21_M_get_Node_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE21_M_get_Node_allocatorEv'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-1697'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-1710'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_put_nodeEPSt10_List_nodeIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_put_nodeEPSt10_List_nodeIS3_E'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <parameter type-id='type-id-1711'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <parameter type-id='type-id-1724'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_init' mangled-name='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE7_M_initEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_baseIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE7_M_initEv'>
-            <parameter type-id='type-id-1694' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1707' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-665'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2799'/>
+      <class-decl name='_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-677'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2821'/>
+        <member-type access='private'>
+          <typedef-decl name='_Functor' type-id='type-id-48' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='512' column='1' id='type-id-2822'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='__pmf' type-id='type-id-2822' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='588' column='1'/>
+        </data-member>
         <member-function access='public'>
           <function-decl name='_Mem_fn' mangled-name='_ZNSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEC2ES6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEC2ES6_'>
-            <parameter type-id='type-id-1714' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1727' is-artificial='yes'/>
+            <parameter type-id='type-id-2822'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEclIJEvEES4_PS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEclIJEvEES4_PS2_DpOT_'>
-            <parameter type-id='type-id-667' is-artificial='yes'/>
-            <parameter type-id='type-id-2622'/>
-            <return type-id='type-id-2590'/>
+            <parameter type-id='type-id-679' is-artificial='yes'/>
+            <parameter type-id='type-id-2642'/>
+            <return type-id='type-id-2611'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-668'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2800'/>
+      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-680'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2823'/>
+        <member-type access='private'>
+          <typedef-decl name='_Functor' type-id='type-id-119' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='512' column='1' id='type-id-2824'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='__pmf' type-id='type-id-2824' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='588' column='1'/>
+        </data-member>
         <member-function access='public'>
           <function-decl name='_Mem_fn' mangled-name='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEC2ESP_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEC2ESP_'>
-            <parameter type-id='type-id-1717' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1730' is-artificial='yes'/>
+            <parameter type-id='type-id-2824'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEclIJRS4_SB_RSD_RmRSL_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEclIJRS4_SB_RSD_RmRSL_EvEEvPS2_DpOT_'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
-            <parameter type-id='type-id-1498'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-360'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-2073'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-682' is-artificial='yes'/>
+            <parameter type-id='type-id-1511'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-373'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-2086'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-671'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2801'/>
+      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-683'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2825'/>
+        <member-type access='private'>
+          <typedef-decl name='_Functor' type-id='type-id-121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='512' column='1' id='type-id-2826'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='__pmf' type-id='type-id-2826' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='588' column='1'/>
+        </data-member>
         <member-function access='public'>
           <function-decl name='_Mem_fn' mangled-name='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEC2ESL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEC2ESL_'>
-            <parameter type-id='type-id-1720' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1733' is-artificial='yes'/>
+            <parameter type-id='type-id-2826'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;, std::mutex *&amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RSJ_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RSJ_EvEEvPS2_DpOT_'>
-            <parameter type-id='type-id-673' is-artificial='yes'/>
-            <parameter type-id='type-id-1498'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2090'/>
-            <parameter type-id='type-id-2104'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-685' is-artificial='yes'/>
+            <parameter type-id='type-id-1511'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2103'/>
+            <parameter type-id='type-id-2117'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, mongo::Status &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;, nullptr_t &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RDnEvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEclIJRS4_RS5_RSA_RSH_RDnEvEEvPS2_DpOT_'>
-            <parameter type-id='type-id-673' is-artificial='yes'/>
-            <parameter type-id='type-id-1498'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2090'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-685' is-artificial='yes'/>
+            <parameter type-id='type-id-1511'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2103'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::OperationContext *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2484'>
+      <class-decl name='_Mu&lt;mongo::OperationContext *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2505'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::OperationContext *&amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo16OperationContextELb0ELb0EEclIRS2_St5tupleIJEEEEOT_S9_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo16OperationContextELb0ELb0EEclIRS2_St5tupleIJEEEEOT_S9_RT0_'>
-            <parameter type-id='type-id-1338' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-2593'/>
+            <parameter type-id='type-id-1350' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-2380'/>
+            <return type-id='type-id-2614'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::Status, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2485'>
+      <class-decl name='_Mu&lt;mongo::Status, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2506'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::Status &amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo6StatusELb0ELb0EEclIRS1_St5tupleIJEEEEOT_S8_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo6StatusELb0ELb0EEclIRS1_St5tupleIJEEEEOT_S8_RT0_'>
-            <parameter type-id='type-id-1341' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
-            <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1353' is-artificial='yes'/>
+            <parameter type-id='type-id-1455'/>
+            <parameter type-id='type-id-2380'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2486'>
+      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2507'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0ELb0EEclIRS4_St5tupleIJRKNS2_12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0ELb0EEclIRS4_St5tupleIJRKNS2_12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-1344' is-artificial='yes'/>
-            <parameter type-id='type-id-1447'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1356' is-artificial='yes'/>
+            <parameter type-id='type-id-1460'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-1460'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::executor::RemoteCommandRequest, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2487'>
+      <class-decl name='_Mu&lt;mongo::executor::RemoteCommandRequest, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2508'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SE_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SE_RT0_'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::RemoteCommandRequest &amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS1_12TaskExecutor12CallbackArgsEEEEEOT_SD_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor20RemoteCommandRequestELb0ELb0EEclIRS2_St5tupleIJRKNS1_12TaskExecutor12CallbackArgsEEEEEOT_SD_RT0_'>
-            <parameter type-id='type-id-1347' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1359' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::executor::TaskExecutor::CallbackArgs, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2488'>
+      <class-decl name='_Mu&lt;mongo::executor::TaskExecutor::CallbackArgs, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2509'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor12CallbackArgsELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor12CallbackArgsELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_'>
-            <parameter type-id='type-id-1350' is-artificial='yes'/>
-            <parameter type-id='type-id-1468'/>
-            <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1362' is-artificial='yes'/>
+            <parameter type-id='type-id-1481'/>
+            <parameter type-id='type-id-2380'/>
+            <return type-id='type-id-1481'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::executor::TaskExecutor::CallbackHandle, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2489'>
+      <class-decl name='_Mu&lt;mongo::executor::TaskExecutor::CallbackHandle, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2510'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIN5mongo8executor12TaskExecutor14CallbackHandleELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1365' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::repl::ReplicationExecutor *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2490'>
+      <class-decl name='_Mu&lt;mongo::repl::ReplicationExecutor *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2511'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRPNS0_16OperationContextERNS0_6StatusEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS0_8executor21RemoteCommandResponseEEEEEEEOT_SG_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRKNS0_10StatusWithINS0_8executor21RemoteCommandResponseEEEEEEEOT_SG_RT0_'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ReplicationExecutor *&amp;, std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRNS0_8executor12TaskExecutor14CallbackHandleEEEEEOT_SE_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ReplicationExecutorELb0ELb0EEclIRS3_St5tupleIJRNS0_8executor12TaskExecutor14CallbackHandleEEEEEOT_SE_RT0_'>
-            <parameter type-id='type-id-1356' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-2802'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1368' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-2827'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::repl::StorageInterface *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2491'>
+      <class-decl name='_Mu&lt;mongo::repl::StorageInterface *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2512'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::StorageInterface *&amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl16StorageInterfaceELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl16StorageInterfaceELb0ELb0EEclIRS3_St5tupleIJEEEEOT_SA_RT0_'>
-            <parameter type-id='type-id-1359' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-2625'/>
+            <parameter type-id='type-id-1371' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <parameter type-id='type-id-2380'/>
+            <return type-id='type-id-2646'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;nullptr_t, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2492'>
+      <class-decl name='_Mu&lt;nullptr_t, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2513'>
         <member-function access='public'>
           <function-decl name='operator()&lt;nullptr_t &amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIDnLb0ELb0EEclIRDnSt5tupleIJRPN5mongo16OperationContextERNS4_6StatusEEEEEOT_SC_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIDnLb0ELb0EEclIRDnSt5tupleIJRPN5mongo16OperationContextERNS4_6StatusEEEEEOT_SC_RT0_'>
-            <parameter type-id='type-id-1362' is-artificial='yes'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1374' is-artificial='yes'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2493'>
+      <class-decl name='_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2514'>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2803'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2828'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2805' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2804'/>
+              <typedef-decl name='type' type-id='type-id-2830' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2829'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2806'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2831'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2807'/>
+              <typedef-decl name='type' type-id='type-id-2833' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2832'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2809'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2834'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2811' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2810'/>
+              <typedef-decl name='type' type-id='type-id-2836' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2835'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2812'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2837'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2814' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2813'/>
+              <typedef-decl name='type' type-id='type-id-2839' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2838'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2815'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;1&gt;, false, true&gt; (std::_Placeholder&lt;1&gt;, std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2840'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2817' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2816'/>
+              <typedef-decl name='type' type-id='type-id-2842' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2841'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRPN5mongo16OperationContextERNS5_6StatusEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRPN5mongo16OperationContextERNS5_6StatusEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_'>
-            <parameter type-id='type-id-1365' is-artificial='yes'/>
-            <parameter type-id='type-id-1386'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-2813'/>
+            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1398'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-2838'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo10StatusWithINS5_8executor21RemoteCommandResponseEEEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo10StatusWithINS5_8executor21RemoteCommandResponseEEEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSE_'>
-            <parameter type-id='type-id-1365' is-artificial='yes'/>
-            <parameter type-id='type-id-1386'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-2804'/>
+            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1398'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-2829'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_'>
-            <parameter type-id='type-id-1365' is-artificial='yes'/>
-            <parameter type-id='type-id-1386'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-2807'/>
+            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1398'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-2832'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSC_'>
-            <parameter type-id='type-id-1365' is-artificial='yes'/>
-            <parameter type-id='type-id-1386'/>
-            <parameter type-id='type-id-2802'/>
-            <return type-id='type-id-2816'/>
+            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1398'/>
+            <parameter type-id='type-id-2827'/>
+            <return type-id='type-id-2841'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi1EELb0ELb1EEclISt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_'>
-            <parameter type-id='type-id-1365' is-artificial='yes'/>
-            <parameter type-id='type-id-1386'/>
-            <parameter type-id='type-id-2818'/>
-            <return type-id='type-id-2810'/>
+            <parameter type-id='type-id-1377' is-artificial='yes'/>
+            <parameter type-id='type-id-1398'/>
+            <parameter type-id='type-id-2843'/>
+            <return type-id='type-id-2835'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2494'>
+      <class-decl name='_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1133' column='1' id='type-id-2515'>
         <member-type access='private'>
-          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt; (std::_Placeholder&lt;2&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2819'>
+          <class-decl name='result&lt;std::_Mu&lt;std::_Placeholder&lt;2&gt;, false, true&gt; (std::_Placeholder&lt;2&gt;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;)&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1139' column='1' id='type-id-2844'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2821' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2820'/>
+              <typedef-decl name='type' type-id='type-id-2846' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1149' column='1' id='type-id-2845'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt12_PlaceholderILi2EELb0ELb1EEclISt5tupleIJRPN5mongo16OperationContextERNS5_6StatusEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt12_PlaceholderILi2EELb0ELb1EEclISt5tupleIJRPN5mongo16OperationContextERNS5_6StatusEEEEENS2_6resultIFS2_S1_T_EE4typeERVKS1_RSD_'>
-            <parameter type-id='type-id-1368' is-artificial='yes'/>
-            <parameter type-id='type-id-1389'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-2820'/>
+            <parameter type-id='type-id-1380' is-artificial='yes'/>
+            <parameter type-id='type-id-1401'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-2845'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::function&lt;void ()&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2495'>
+      <class-decl name='_Mu&lt;std::function&lt;void ()&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2516'>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::function&lt;void ()&gt; &amp;, std::tuple&lt;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt8functionIFvvEELb0ELb0EEclIRS2_St5tupleIJEEEEOT_S9_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt8functionIFvvEELb0ELb0EEclIRS2_St5tupleIJEEEEOT_S9_RT0_'>
-            <parameter type-id='type-id-1371' is-artificial='yes'/>
-            <parameter type-id='type-id-2064'/>
-            <parameter type-id='type-id-2361'/>
-            <return type-id='type-id-2064'/>
+            <parameter type-id='type-id-1383' is-artificial='yes'/>
+            <parameter type-id='type-id-2077'/>
+            <parameter type-id='type-id-2380'/>
+            <return type-id='type-id-2077'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2496'>
+      <class-decl name='_Mu&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2517'>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0ELb0EEclIRS8_St5tupleIJRKNS1_10StatusWithINS2_21RemoteCommandResponseEEEEEEEOT_SK_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0ELb0EEclIRS8_St5tupleIJRKNS1_10StatusWithINS2_21RemoteCommandResponseEEEEEEEOT_SK_RT0_'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-2073'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1386' is-artificial='yes'/>
+            <parameter type-id='type-id-2086'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0ELb0EEclIRS8_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SI_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0ELb0EEclIRS8_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SI_RT0_'>
-            <parameter type-id='type-id-1374' is-artificial='yes'/>
-            <parameter type-id='type-id-2073'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1386' is-artificial='yes'/>
+            <parameter type-id='type-id-2086'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2497'>
+      <class-decl name='_Mu&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2518'>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0ELb0EEclIRS7_St5tupleIJRPNS1_16OperationContextERNS1_6StatusEEEEEOT_SJ_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0ELb0EEclIRS7_St5tupleIJRPNS1_16OperationContextERNS1_6StatusEEEEEOT_SJ_RT0_'>
-            <parameter type-id='type-id-1377' is-artificial='yes'/>
-            <parameter type-id='type-id-2090'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-2090'/>
+            <parameter type-id='type-id-1389' is-artificial='yes'/>
+            <parameter type-id='type-id-2103'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-2103'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;std::mutex *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2498'>
+      <class-decl name='_Mu&lt;std::mutex *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2519'>
         <member-function access='public'>
           <function-decl name='operator()&lt;std::mutex *&amp;, std::tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPSt5mutexLb0ELb0EEclIRS1_St5tupleIJRPN5mongo16OperationContextERNS6_6StatusEEEEEOT_SE_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPSt5mutexLb0ELb0EEclIRS1_St5tupleIJRPN5mongo16OperationContextERNS6_6StatusEEEEEOT_SE_RT0_'>
-            <parameter type-id='type-id-1380' is-artificial='yes'/>
-            <parameter type-id='type-id-2104'/>
-            <parameter type-id='type-id-2370'/>
-            <return type-id='type-id-2104'/>
+            <parameter type-id='type-id-1392' is-artificial='yes'/>
+            <parameter type-id='type-id-2117'/>
+            <parameter type-id='type-id-2389'/>
+            <return type-id='type-id-2117'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;unsigned long, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2499'>
+      <class-decl name='_Mu&lt;unsigned long, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-2520'>
         <member-function access='public'>
           <function-decl name='operator()&lt;unsigned long &amp;, std::tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuImLb0ELb0EEclIRmSt5tupleIJRKN5mongo10StatusWithINS4_8executor21RemoteCommandResponseEEEEEEEOT_SD_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuImLb0ELb0EEclIRmSt5tupleIJRKN5mongo10StatusWithINS4_8executor21RemoteCommandResponseEEEEEEEOT_SD_RT0_'>
-            <parameter type-id='type-id-1383' is-artificial='yes'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-2364'/>
-            <return type-id='type-id-2448'/>
+            <parameter type-id='type-id-1395' is-artificial='yes'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-2383'/>
+            <return type-id='type-id-2467'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mutex_base&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='88' column='1' id='type-id-2822'/>
-      <class-decl name='_Sp_counted_base&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-680'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2822'/>
+      <class-decl name='_Mutex_base&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='88' column='1' id='type-id-2847'/>
+      <class-decl name='_Sp_counted_base&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='107' column='1' id='type-id-692'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2847'/>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_use_count' type-id='type-id-59' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='206' column='1'/>
+          <var-decl name='_M_use_count' type-id='type-id-64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='206' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='96'>
-          <var-decl name='_M_weak_count' type-id='type-id-59' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='207' column='1'/>
+          <var-decl name='_M_weak_count' type-id='type-id-64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='207' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Sp_counted_base' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EEC2Ev'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Sp_counted_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <parameter type-id='type-id-682'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <parameter type-id='type-id-694'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_release' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_releaseEv'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_add_ref_copy' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE15_M_add_ref_copyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE15_M_add_ref_copyEv'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~_Sp_counted_base' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='_M_dispose' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='_M_destroy' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1726' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1739' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_counted_ptr&lt;mongo::repl::ReplicationExecutor::Callback *, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='364' column='1' id='type-id-684'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-680'/>
+      <class-decl name='_Sp_counted_ptr&lt;mongo::repl::ReplicationExecutor::Callback *, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='364' column='1' id='type-id-696'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_ptr' type-id='type-id-1504' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='387' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-1517' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='387' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr' mangled-name='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EEC2ES4_'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <parameter type-id='type-id-1517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <parameter type-id='type-id-686'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <parameter type-id='type-id-698'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='_M_dispose' mangled-name='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='_M_destroy' mangled-name='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15_Sp_counted_ptrIPN5mongo4repl19ReplicationExecutor8CallbackELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
-            <parameter type-id='type-id-1728' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1741' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-687'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-680'/>
+      <class-decl name='_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-699'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
         <member-type access='private'>
-          <class-decl name='_Impl' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1731'>
-            <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1737'/>
+          <class-decl name='_Impl' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1744'>
+            <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1750'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_storage' type-id='type-id-114' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='505' column='1'/>
+              <var-decl name='_M_storage' type-id='type-id-127' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='505' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE5_ImplC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='501' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE5_ImplC2ES4_'>
-                <parameter type-id='type-id-1732' is-artificial='yes'/>
-                <parameter type-id='type-id-1046'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1745' is-artificial='yes'/>
+                <parameter type-id='type-id-1058'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_alloc' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE5_Impl8_M_allocEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE5_Impl8_M_allocEv'>
-                <parameter type-id='type-id-1732' is-artificial='yes'/>
-                <return type-id='type-id-2010'/>
+                <parameter type-id='type-id-1745' is-artificial='yes'/>
+                <return type-id='type-id-2023'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_impl' type-id='type-id-1731' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='552' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1744' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='552' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEC2IJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEES4_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEC2IJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEES4_DpOT_'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <parameter type-id='type-id-1046'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_ptr' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <return type-id='type-id-1506'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <return type-id='type-id-1519'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~_Sp_counted_ptr_inplace' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EED0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='_M_dispose' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='_M_destroy' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='540' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
-            <parameter type-id='type-id-1730' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1743' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-691'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-680'/>
+      <class-decl name='_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='494' column='1' id='type-id-703'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-692'/>
         <member-type access='private'>
-          <class-decl name='_Impl' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1735'>
-            <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1740'/>
+          <class-decl name='_Impl' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='496' column='1' id='type-id-1748'>
+            <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1753'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_storage' type-id='type-id-118' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='505' column='1'/>
+              <var-decl name='_M_storage' type-id='type-id-131' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='505' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Impl' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE5_ImplC2ESA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='501' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1736' is-artificial='yes'/>
-                <parameter type-id='type-id-1071'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1749' is-artificial='yes'/>
+                <parameter type-id='type-id-1083'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_alloc' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE5_Impl8_M_allocEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='503' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1736' is-artificial='yes'/>
-                <return type-id='type-id-2022'/>
+                <parameter type-id='type-id-1749' is-artificial='yes'/>
+                <return type-id='type-id-2035'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_impl' type-id='type-id-1735' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='552' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1748' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='552' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr_inplace&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EEC2IJS8_EEESA_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='510' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <parameter type-id='type-id-1071'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <parameter type-id='type-id-1083'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_ptr' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <return type-id='type-id-2350'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-2369'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~_Sp_counted_ptr_inplace' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EED0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='2'>
           <function-decl name='_M_dispose' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='3'>
           <function-decl name='_M_destroy' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='540' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1734' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1747' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__make_unsigned_selector&lt;long, true, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1634' column='1' id='type-id-2823'>
+      <class-decl name='__make_unsigned_selector&lt;long, true, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1634' column='1' id='type-id-2848'>
         <member-type access='private'>
-          <typedef-decl name='__type' type-id='type-id-2825' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1641' column='1' id='type-id-2824'/>
+          <typedef-decl name='__type' type-id='type-id-2850' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1641' column='1' id='type-id-2849'/>
         </member-type>
       </class-decl>
-      <class-decl name='__match_cv_qualifiers&lt;long, unsigned long, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1578' column='1' id='type-id-2826'>
+      <class-decl name='__match_cv_qualifiers&lt;long, unsigned long, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1578' column='1' id='type-id-2851'>
         <member-type access='private'>
-          <typedef-decl name='__type' type-id='type-id-2827' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2825'/>
+          <typedef-decl name='__type' type-id='type-id-2852' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1583' column='1' id='type-id-2850'/>
         </member-type>
       </class-decl>
-      <class-decl name='__mutex_base' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='57' column='1' id='type-id-1009'>
+      <class-decl name='__mutex_base' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='57' column='1' id='type-id-1021'>
         <member-type access='private'>
-          <typedef-decl name='__native_type' type-id='type-id-69' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='60' column='1' id='type-id-1976'/>
+          <typedef-decl name='__native_type' type-id='type-id-74' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='60' column='1' id='type-id-1989'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_mutex' type-id='type-id-1976' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='63' column='1'/>
+          <var-decl name='_M_mutex' type-id='type-id-1989' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='63' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='__mutex_base' mangled-name='_ZNSt12__mutex_baseC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__mutex_baseC2Ev'>
-            <parameter type-id='type-id-1975' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1988' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='__mutex_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1975' is-artificial='yes'/>
-            <parameter type-id='type-id-1011'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1988' is-artificial='yes'/>
+            <parameter type-id='type-id-1023'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_count&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-1012'>
+      <class-decl name='__shared_count&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='557' column='1' id='type-id-1024'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_pi' type-id='type-id-1726' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='727' column='1'/>
+          <var-decl name='_M_pi' type-id='type-id-1739' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='727' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_count' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2Ev'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_count' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2ERKS2_'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1026'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count&lt;mongo::repl::ReplicationExecutor::Callback *&gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IPN5mongo4repl19ReplicationExecutor8CallbackEEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IPN5mongo4repl19ReplicationExecutor8CallbackEEET_'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IN5mongo4repl19ReplicationExecutor5EventESaIS7_EJPS6_RSt14_List_iteratorINS4_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2IN5mongo4repl19ReplicationExecutor5EventESaIS7_EJPS6_RSt14_List_iteratorINS4_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1506'/>
-            <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-1519'/>
+            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2INSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISD_EJSC_EEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='608' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-2350'/>
-            <parameter type-id='type-id-1073'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-2369'/>
+            <parameter type-id='type-id-1085'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_swap' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_swapERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_swapERS2_'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1986'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1999'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='708' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
-            <parameter type-id='type-id-1015' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1027' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEaSERKS2_'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
-            <return type-id='type-id-1986'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1026'/>
+            <return type-id='type-id-1999'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='658' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='661' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='663' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1987' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2000' is-artificial='yes'/>
+            <parameter type-id='type-id-1026'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1016'>
+      <class-decl name='__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1028'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-2605' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-2626' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-1024' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1018'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-1030'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2EOS6_'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1989'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2002'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-2536'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2557'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Callback&gt;' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='870' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-1517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEaSEOS6_'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1989'/>
-            <return type-id='type-id-1988'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2002'/>
+            <return type-id='type-id-2001'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EE4swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1067' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EE4swapERS6_'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1988'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2001'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1052' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EE3getEv'>
-            <parameter type-id='type-id-1019' is-artificial='yes'/>
-            <return type-id='type-id-2605'/>
+            <parameter type-id='type-id-1031' is-artificial='yes'/>
+            <return type-id='type-id-2626'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1018'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-1030'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-1989'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2002'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1990' is-artificial='yes'/>
-            <parameter type-id='type-id-2536'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2003' is-artificial='yes'/>
+            <parameter type-id='type-id-2557'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1020'>
+      <class-decl name='__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1032'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-2609' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-2630' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-1024' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2ERKS6_'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-1034'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2EOS6_'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1992'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2005'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-2539'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2560'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Event, void&gt;' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor5EventEvEEOS_IT_LS5_2EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEC2INS0_4repl19ReplicationExecutor5EventEvEEOS_IT_LS5_2EE'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1995'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2008'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEaSEOS6_'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1992'/>
-            <return type-id='type-id-1991'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2005'/>
+            <return type-id='type-id-2004'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EE4swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1067' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EE4swapERS6_'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1991'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2004'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEaSERKS6_'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
-            <return type-id='type-id-1991'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-1034'/>
+            <return type-id='type-id-2004'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1022'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-1034'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-1992'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2005'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1993' is-artificial='yes'/>
-            <parameter type-id='type-id-2539'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2006' is-artificial='yes'/>
+            <parameter type-id='type-id-2560'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1052' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EE3getEv'>
-            <parameter type-id='type-id-1023' is-artificial='yes'/>
-            <return type-id='type-id-2830'/>
+            <parameter type-id='type-id-1035' is-artificial='yes'/>
+            <return type-id='type-id-2855'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1024'>
+      <class-decl name='__shared_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1036'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-1506' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-1519' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-1024' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <parameter type-id='type-id-1026'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <parameter type-id='type-id-1038'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrIN5mongo4repl19ReplicationExecutor5EventELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo4repl19ReplicationExecutor5EventELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <parameter type-id='type-id-1995'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <parameter type-id='type-id-2008'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <parameter type-id='type-id-2542'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <parameter type-id='type-id-2563'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr&lt;std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt12__shared_ptrIN5mongo4repl19ReplicationExecutor5EventELN9__gnu_cxx12_Lock_policyE2EEC2ISaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1087' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrIN5mongo4repl19ReplicationExecutor5EventELN9__gnu_cxx12_Lock_policyE2EEC2ISaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagRKT_DpOT0_'>
-            <parameter type-id='type-id-1996' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2009' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1028'>
+      <class-decl name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1040'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-2350' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-2369' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-1024' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <parameter type-id='type-id-1030'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <parameter type-id='type-id-1042'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <parameter type-id='type-id-1998'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <parameter type-id='type-id-2011'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <parameter type-id='type-id-2545'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <parameter type-id='type-id-2566'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEELN9__gnu_cxx12_Lock_policyE2EEC2ISaIS9_EJS8_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1087' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1999' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1073'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2012' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-1085'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__shared_ptr&lt;std::thread::_Impl_base, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1032'>
+      <class-decl name='__shared_ptr&lt;std::thread::_Impl_base, __gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='860' column='1' id='type-id-1044'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_ptr' type-id='type-id-2353' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
+          <var-decl name='_M_ptr' type-id='type-id-2372' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1174' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_refcount' type-id='type-id-1012' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
+          <var-decl name='_M_refcount' type-id='type-id-1024' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1175' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__shared_ptr' mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2Ev'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='912' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <parameter type-id='type-id-1034'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <parameter type-id='type-id-1046'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__shared_ptr' mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EED2Ev'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='922' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <parameter type-id='type-id-2001'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <parameter type-id='type-id-2014'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='1145' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <parameter type-id='type-id-2548'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <parameter type-id='type-id-2569'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, void&gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2INS0_5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEvEEOS_IT_LS3_2EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='931' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2002' is-artificial='yes'/>
-            <parameter type-id='type-id-1998'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2015' is-artificial='yes'/>
+            <parameter type-id='type-id-2011'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__weak_count&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='732' column='1' id='type-id-1036'>
+      <class-decl name='__weak_count&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='732' column='1' id='type-id-1048'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_pi' type-id='type-id-1726' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='810' column='1'/>
+          <var-decl name='_M_pi' type-id='type-id-1739' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='810' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='738' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-1026'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='735' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='738' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <parameter type-id='type-id-1014'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-1026'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <parameter type-id='type-id-1038'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <parameter type-id='type-id-1050'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__weak_count' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2006' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2019' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1040'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-120'/>
+      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1052'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-133'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2831'>
+          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2856'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1040' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2795'/>
+              <typedef-decl name='other' type-id='type-id-1052' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2817'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='rebind&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2832'>
+          <class-decl name='rebind&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2857'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1053' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2793'/>
+              <typedef-decl name='other' type-id='type-id-1065' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2815'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2007' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2007' is-artificial='yes'/>
-            <parameter type-id='type-id-1042'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
+            <parameter type-id='type-id-1054'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2007' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2020' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1043'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-122'/>
+      <class-decl name='allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1055'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-135'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2833'>
+          <class-decl name='rebind&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2858'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1043' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2834'/>
+              <typedef-decl name='other' type-id='type-id-1055' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2859'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2835'/>
+          <typedef-decl name='pointer' type-id='type-id-2638' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='97' column='1' id='type-id-2860'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-2612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2836'/>
+          <typedef-decl name='value_type' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2861'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2009' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2022' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2009' is-artificial='yes'/>
-            <parameter type-id='type-id-1045'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2022' is-artificial='yes'/>
+            <parameter type-id='type-id-1057'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2009' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2022' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1046'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-124'/>
+      <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1058'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-137'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-441' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2837'/>
+          <typedef-decl name='value_type' type-id='type-id-453' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2862'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEEC2Ev'>
-            <parameter type-id='type-id-2011' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2024' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEEC2ERKS3_'>
-            <parameter type-id='type-id-2011' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2024' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo4repl19ReplicationExecutor5EventEED2Ev'>
-            <parameter type-id='type-id-2011' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2024' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1050'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-126'/>
+      <class-decl name='allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1062'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-139'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2838'>
+          <class-decl name='rebind&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2863'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1050' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2798'/>
+              <typedef-decl name='other' type-id='type-id-1062' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2820'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='rebind&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2839'>
+          <class-decl name='rebind&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-2864'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-1056' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2796'/>
+              <typedef-decl name='other' type-id='type-id-1068' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-2818'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2012' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2012' is-artificial='yes'/>
-            <parameter type-id='type-id-1052'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
+            <parameter type-id='type-id-1064'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2012' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2025' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1053'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-128'/>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1065'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-141'/>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEEC2Ev'>
-            <parameter type-id='type-id-2013' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2026' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2013' is-artificial='yes'/>
-            <parameter type-id='type-id-1055'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2026' is-artificial='yes'/>
+            <parameter type-id='type-id-1067'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEED2Ev'>
-            <parameter type-id='type-id-2013' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2026' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1056'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-130'/>
+      <class-decl name='allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1068'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-143'/>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEEC2Ev'>
-            <parameter type-id='type-id-2014' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2027' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2014' is-artificial='yes'/>
-            <parameter type-id='type-id-1058'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2027' is-artificial='yes'/>
+            <parameter type-id='type-id-1070'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEED2Ev'>
-            <parameter type-id='type-id-2014' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2027' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1059'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-132'/>
+      <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1071'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-145'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2840'/>
+          <typedef-decl name='value_type' type-id='type-id-699' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2865'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2016' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2029' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2016' is-artificial='yes'/>
-            <parameter type-id='type-id-1061'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2029' is-artificial='yes'/>
+            <parameter type-id='type-id-1073'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEED2Ev'>
-            <parameter type-id='type-id-2016' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2029' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEEC2IS3_EERKSaIT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS3_ELN9__gnu_cxx12_Lock_policyE2EEEC2IS3_EERKSaIT_E'>
-            <parameter type-id='type-id-2016' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2029' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1062'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-134'/>
+      <class-decl name='allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1074'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-147'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-691' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2841'/>
+          <typedef-decl name='value_type' type-id='type-id-703' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2866'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2018' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2031' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2018' is-artificial='yes'/>
-            <parameter type-id='type-id-1064'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2031' is-artificial='yes'/>
+            <parameter type-id='type-id-1076'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2018' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2031' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' mangled-name='_ZNSaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaIS9_ELN9__gnu_cxx12_Lock_policyE2EEEC2IS9_EERKSaIT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2018' is-artificial='yes'/>
-            <parameter type-id='type-id-1073'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2031' is-artificial='yes'/>
+            <parameter type-id='type-id-1085'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1065'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-136'/>
+      <class-decl name='allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1077'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-149'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-951' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2842'/>
+          <typedef-decl name='value_type' type-id='type-id-963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2867'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2020' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2033' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2020' is-artificial='yes'/>
-            <parameter type-id='type-id-1067'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2033' is-artificial='yes'/>
+            <parameter type-id='type-id-1079'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2020' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2033' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1068'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-138'/>
+      <class-decl name='allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1080'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-151'/>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2021' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2034' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2021' is-artificial='yes'/>
-            <parameter type-id='type-id-1070'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2034' is-artificial='yes'/>
+            <parameter type-id='type-id-1082'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2021' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2034' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1071'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-140'/>
+      <class-decl name='allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-1083'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-153'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-1215' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2843'/>
+          <typedef-decl name='value_type' type-id='type-id-1227' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-2868'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2023' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2036' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEC2ERKS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2023' is-artificial='yes'/>
-            <parameter type-id='type-id-1073'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2036' is-artificial='yes'/>
+            <parameter type-id='type-id-1085'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2023' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2036' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='condition_variable' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='64' column='1' id='type-id-1102'>
+      <class-decl name='condition_variable' size-in-bits='384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='64' column='1' id='type-id-1114'>
         <member-type access='private'>
-          <typedef-decl name='__native_type' type-id='type-id-67' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='67' column='1' id='type-id-2044'/>
+          <typedef-decl name='__native_type' type-id='type-id-72' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='67' column='1' id='type-id-2057'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='native_handle_type' type-id='type-id-2045' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='76' column='1' id='type-id-2844'/>
+          <typedef-decl name='native_handle_type' type-id='type-id-2058' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='76' column='1' id='type-id-2869'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_cond' type-id='type-id-2044' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='70' column='1'/>
+          <var-decl name='_M_cond' type-id='type-id-2057' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='70' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='condition_variable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2043' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2056' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~condition_variable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2043' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2056' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='condition_variable' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/condition_variable' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2043' is-artificial='yes'/>
-            <parameter type-id='type-id-1104'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2056' is-artificial='yes'/>
+            <parameter type-id='type-id-1116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;mongo::OperationContext *()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1125'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2845'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;mongo::OperationContext *()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1137'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2870'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1433' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2846'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1445' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2871'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2846' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2871' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2073' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2073' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <parameter type-id='type-id-1127'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2073' is-artificial='yes'/>
+            <parameter type-id='type-id-1139'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <parameter type-id='type-id-2059'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2073' is-artificial='yes'/>
+            <parameter type-id='type-id-2072'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt;, void&gt;' mangled-name='_ZNSt8functionIFPN5mongo16OperationContextEvEEC2ISt5_BindIFSt7_Mem_fnIMNS0_4repl16StorageInterfaceEFS2_vEEPS9_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFPN5mongo16OperationContextEvEEC2ISt5_BindIFSt7_Mem_fnIMNS0_4repl16StorageInterfaceEFS2_vEEPS9_EEvEET_'>
-            <parameter type-id='type-id-2060' is-artificial='yes'/>
-            <parameter type-id='type-id-468'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2073' is-artificial='yes'/>
+            <parameter type-id='type-id-480'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1129'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2847'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;mongo::repl::TaskRunner::NextAction (mongo::OperationContext *, const mongo::Status &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1141'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2872'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-1513' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2848'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-1526' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2873'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2848' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2873' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <parameter type-id='type-id-1131'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <parameter type-id='type-id-1143'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <parameter type-id='type-id-2062'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <parameter type-id='type-id-2075'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:357:21), void&gt;' mangled-name='_ZNSt8functionIFN5mongo4repl10TaskRunner10NextActionEPNS0_16OperationContextERKNS0_6StatusEEEC2IZNS1_19ReplicationExecutor14scheduleDBWorkERKS_IFvRKNS0_8executor12TaskExecutor12CallbackArgsEEERKNS0_15NamespaceStringENS0_8LockModeEE3$_1vEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:413:13), void&gt;' mangled-name='_ZNSt8functionIFN5mongo4repl10TaskRunner10NextActionEPNS0_16OperationContextERKNS0_6StatusEEEC2IZNS1_19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKS_IFvRKNS0_8executor12TaskExecutor12CallbackArgsEEEE3$_2vEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2063' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2076' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;void ()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1133'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2849'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;void ()&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1145'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2874'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2850'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2482' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2875'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2850' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2875' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvvEEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2ERKS1_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvvEEC2EOS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2EOS1_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-2078'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvvEEC2ISt5_BindIFS_IFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES7_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2ISt5_BindIFS_IFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES7_EEvEET_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-480'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-492'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvvEEC2ISt5_BindIFS3_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS5_16OperationContextERKNS5_6StatusERKNS5_8executor12TaskExecutor14CallbackHandleEPSt4listINS7_8WorkItemESaISJ_EEPSt5mutexEEPS7_St12_PlaceholderILi1EEST_ILi2EESF_SM_SO_EES9_SA_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2ISt5_BindIFS3_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS5_16OperationContextERKNS5_6StatusERKNS5_8executor12TaskExecutor14CallbackHandleEPSt4listINS7_8WorkItemESaISJ_EEPSt5mutexEEPS7_St12_PlaceholderILi1EEST_ILi2EESF_SM_SO_EES9_SA_EEvEET_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-465'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-477'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvvEEC2ISt5_BindIFS3_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS5_16OperationContextERKNS5_6StatusERKNS5_8executor12TaskExecutor14CallbackHandleEPSt4listINS7_8WorkItemESaISJ_EEPSt5mutexEEPS7_St12_PlaceholderILi1EEST_ILi2EESF_SM_DnEES9_SA_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2ISt5_BindIFS3_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS5_16OperationContextERKNS5_6StatusERKNS5_8executor12TaskExecutor14CallbackHandleEPSt4listINS7_8WorkItemESaISJ_EEPSt5mutexEEPS7_St12_PlaceholderILi1EEST_ILi2EESF_SM_DnEES9_SA_EEvEET_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-474'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvvEEC2ISt5_BindIFPFvRKS1_ES1_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2ISt5_BindIFPFvRKS1_ES1_EEvEET_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-501'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFvvEEclEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvvEEclEv'>
-            <parameter type-id='type-id-1136' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1148' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFvvEEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvvEEcvbEv'>
-            <parameter type-id='type-id-1136' is-artificial='yes'/>
+            <parameter type-id='type-id-1148' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt8functionIFvvEE4swapERS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEE4swapERS1_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-2064'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-2077'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvvEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEC2Ev'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-2078'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFvvEEaSERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvvEEaSERKS1_'>
-            <parameter type-id='type-id-2066' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2064'/>
+            <parameter type-id='type-id-2079' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2077'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;void (const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1137'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2851'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;void (const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1149'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2876'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2852'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2485' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2877'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2852' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2877' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2069' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2082' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2069' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2082' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2069' is-artificial='yes'/>
-            <parameter type-id='type-id-1139'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2082' is-artificial='yes'/>
+            <parameter type-id='type-id-1151'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2069' is-artificial='yes'/>
-            <parameter type-id='type-id-2068'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2082' is-artificial='yes'/>
+            <parameter type-id='type-id-2081'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ISt5_BindIFSt7_Mem_fnIMNS0_4repl19ReplicationExecutorEFvRKNS2_20RemoteCommandRequestES6_RKNS2_12TaskExecutor14CallbackHandleEmRKS_IFvRKNSH_25RemoteCommandCallbackArgsEEEEEPSD_SE_St12_PlaceholderILi1EESI_mSP_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ISt5_BindIFSt7_Mem_fnIMNS0_4repl19ReplicationExecutorEFvRKNS2_20RemoteCommandRequestES6_RKNS2_12TaskExecutor14CallbackHandleEmRKS_IFvRKNSH_25RemoteCommandCallbackArgsEEEEEPSD_SE_St12_PlaceholderILi1EESI_mSP_EEvEET_'>
-            <parameter type-id='type-id-2069' is-artificial='yes'/>
-            <parameter type-id='type-id-471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2082' is-artificial='yes'/>
+            <parameter type-id='type-id-483'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1141'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2853'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1153'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2878'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2854'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2879'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Requires&lt;_Callable&lt;typename decay&lt;_Bind&lt;void (*(_Placeholder&lt;1&gt;, function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt;, RemoteCommandRequest, StatusWith&lt;RemoteCommandResponse&gt;))(const CallbackArgs &amp;, const function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt; &amp;, const RemoteCommandRequest &amp;, const StatusWith&lt;RemoteCommandResponse&gt; &amp;)&gt; &gt;::type&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' type-id='type-id-2856' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2163' column='1' id='type-id-2855'/>
+          <typedef-decl name='_Requires&lt;_Callable&lt;typename decay&lt;_Bind&lt;void (*(_Placeholder&lt;1&gt;, function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt;, RemoteCommandRequest, StatusWith&lt;RemoteCommandResponse&gt;))(const CallbackArgs &amp;, const function&lt;void (const RemoteCommandCallbackArgs &amp;)&gt; &amp;, const RemoteCommandRequest &amp;, const StatusWith&lt;RemoteCommandResponse&gt; &amp;)&gt; &gt;::type&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' type-id='type-id-2881' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2163' column='1' id='type-id-2880'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2854' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2879' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS7_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-1143'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-1155'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS7_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2071'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-2084'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESE_SH_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEESt12_PlaceholderILi1EESE_SH_EEvEET_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-483'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-495'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESE_SH_SM_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESE_SH_SM_EEvEET_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-486'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-498'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEaSISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESE_SH_SM_EEEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt7is_sameINSt5decayIT_E4typeES7_EESt5__or_IJSt7is_voidIvESt14is_convertibleIDTclcl18__callable_functorclsr3stdE7declvalIRS12_EEEclL_ZSt7declvalIS5_ENSt20add_rvalue_referenceIS10_E4typeEvEEEEvEEEEE5valueERS7_E4typeEOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEaSISt5_BindIFPFvS5_RKS_IFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESE_SH_SM_EEEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt7is_sameINSt5decayIT_E4typeES7_EESt5__or_IJSt7is_voidIvESt14is_convertibleIDTclcl18__callable_functorclsr3stdE7declvalIRS12_EEEclL_ZSt7declvalIS5_ENSt20add_rvalue_referenceIS10_E4typeEvEEEEvEEEEE5valueERS7_E4typeEOS10_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-1562'/>
-            <return type-id='type-id-2855'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-1575'/>
+            <return type-id='type-id-2880'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEclES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEclES5_'>
-            <parameter type-id='type-id-1144' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1156' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEcvbEv'>
-            <parameter type-id='type-id-1144' is-artificial='yes'/>
+            <parameter type-id='type-id-1156' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEE4swapERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEE4swapERS7_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2070'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-2083'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-1143'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-1155'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2071'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-2084'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESC_SG_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ISt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESC_SG_EEvEET_'>
-            <parameter type-id='type-id-2072' is-artificial='yes'/>
-            <parameter type-id='type-id-2857'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2085' is-artificial='yes'/>
+            <parameter type-id='type-id-2882'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1145'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2858'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-495'/>
+      <class-decl name='function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2142' column='1' id='type-id-1157'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2883'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-507'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2859'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2490' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2398' column='1' id='type-id-2884'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2859' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2884' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2399' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ERKS7_'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2EOS7_'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-2074'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEcvbEv'>
-            <parameter type-id='type-id-1148' is-artificial='yes'/>
+            <parameter type-id='type-id-1160' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE4swapERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE4swapERS7_'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-2073'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-2086'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEclES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEclES5_'>
-            <parameter type-id='type-id-1148' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1160' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2174' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-2074'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='function&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;, void&gt;' mangled-name='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ISt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESC_EEvEET_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ISt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESC_EEvEET_'>
-            <parameter type-id='type-id-2075' is-artificial='yes'/>
-            <parameter type-id='type-id-2860'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2088' is-artificial='yes'/>
+            <parameter type-id='type-id-2885'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1159'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-613'/>
+      <class-decl name='list&lt;mongo::executor::TaskExecutor::EventHandle, std::allocator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1171'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-625'/>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2861'/>
+          <typedef-decl name='const_iterator' type-id='type-id-637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2886'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2672' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2862'/>
+          <typedef-decl name='const_reference' type-id='type-id-2694' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2887'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-645' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-632'/>
+          <typedef-decl name='iterator' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-644'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2674' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2863'/>
+          <typedef-decl name='reference' type-id='type-id-2696' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2888'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-402' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1166'/>
+          <typedef-decl name='value_type' type-id='type-id-415' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1178'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-2865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2864'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-2890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2889'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-2867' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2866'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-2892' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2891'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='list' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-1165'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-1177'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-1168'/>
-            <parameter type-id='type-id-1165'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-1180'/>
+            <parameter type-id='type-id-1177'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-1161'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-1173'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='607' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-2080'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-2093'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-2868'/>
-            <parameter type-id='type-id-1165'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-2893'/>
+            <parameter type-id='type-id-1177'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='886' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE4sizeEv'>
-            <parameter type-id='type-id-1162' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-632'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-632'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5emptyEv'>
-            <parameter type-id='type-id-1162' is-artificial='yes'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;&gt;' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE12emplace_backIJEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1038' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE12emplace_backIJEEEvDpOT_'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='back' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE4backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE4backEv'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-2863'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-2888'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='erase' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5eraseESt20_List_const_iteratorIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5eraseESt20_List_const_iteratorIS3_E'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-2861'/>
-            <return type-id='type-id-632'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-2886'/>
+            <return type-id='type-id-644'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE8_M_eraseESt14_List_iteratorIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE8_M_eraseESt14_List_iteratorIS3_E'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-632'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-644'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;&gt;' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE9_M_insertIJEEEvSt14_List_iteratorIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE9_M_insertIJEEEvSt14_List_iteratorIS3_EDpOT_'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <parameter type-id='type-id-632'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <parameter type-id='type-id-644'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node&lt;&gt;' mangled-name='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE14_M_create_nodeIJEEEPSt10_List_nodeIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE14_M_create_nodeIJEEEPSt10_List_nodeIS3_EDpOT_'>
-            <parameter type-id='type-id-2081' is-artificial='yes'/>
-            <return type-id='type-id-2083'/>
+            <parameter type-id='type-id-2094' is-artificial='yes'/>
+            <return type-id='type-id-2096'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-1162' is-artificial='yes'/>
-            <return type-id='type-id-2861'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-2886'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo8executor12TaskExecutor11EventHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-1162' is-artificial='yes'/>
-            <return type-id='type-id-2861'/>
+            <parameter type-id='type-id-1174' is-artificial='yes'/>
+            <return type-id='type-id-2886'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1169'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-619'/>
+      <class-decl name='list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='447' column='1' id='type-id-1181'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-631'/>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-635' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2869'/>
+          <typedef-decl name='const_iterator' type-id='type-id-647' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='465' column='1' id='type-id-2894'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2870'/>
+          <typedef-decl name='const_reference' type-id='type-id-2707' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='463' column='1' id='type-id-2895'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-651' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-642'/>
+          <typedef-decl name='iterator' type-id='type-id-663' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='464' column='1' id='type-id-654'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2871'/>
+          <typedef-decl name='reference' type-id='type-id-2709' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='462' column='1' id='type-id-2896'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-445' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1176'/>
+          <typedef-decl name='value_type' type-id='type-id-457' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='459' column='1' id='type-id-1188'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-2873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2872'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-2898' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='466' column='1' id='type-id-2897'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-2875' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2874'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-2900' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='467' column='1' id='type-id-2899'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='list' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-1175'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-1187'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='568' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-1178'/>
-            <parameter type-id='type-id-1175'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-1190'/>
+            <parameter type-id='type-id-1187'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-1171'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-1183'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='607' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2086'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2099'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2876'/>
-            <parameter type-id='type-id-1175'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2901'/>
+            <parameter type-id='type-id-1187'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='886' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE4sizeEv'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-1184' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2085'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2098'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE3endEv'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <return type-id='type-id-642'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <return type-id='type-id-654'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <return type-id='type-id-642'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <return type-id='type-id-654'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5emptyEv'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
+            <parameter type-id='type-id-1184' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_S7_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2085'/>
-            <parameter type-id='type-id-2869'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2098'/>
+            <parameter type-id='type-id-2894'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_S7_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_ERS5_S7_S7_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2085'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2869'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2098'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2894'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_front' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE10push_frontEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='992' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE10push_frontEOS3_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2094'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2107'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_insert&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE9_M_insertIJS3_EEEvSt14_List_iteratorIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE9_M_insertIJS3_EEEvSt14_List_iteratorIS3_EDpOT_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-642'/>
-            <parameter type-id='type-id-1508'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-654'/>
+            <parameter type-id='type-id-1521'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_create_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE14_M_create_nodeIJS3_EEEPSt10_List_nodeIS3_EDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE14_M_create_nodeIJS3_EEEPSt10_List_nodeIS3_EDpOT_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
-            <return type-id='type-id-2093'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-1521'/>
+            <return type-id='type-id-2106'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_S7_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_S7_S7_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2086'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2869'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2099'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2894'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_equal_allocators' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE25_M_check_equal_allocatorsERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1709' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE25_M_check_equal_allocatorsERS5_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2085'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2098'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_transfer' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_transferESt14_List_iteratorIS3_ES7_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE11_M_transferESt14_List_iteratorIS3_ES7_S7_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-642'/>
-            <parameter type-id='type-id-642'/>
-            <parameter type-id='type-id-642'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-654'/>
+            <parameter type-id='type-id-654'/>
+            <parameter type-id='type-id-654'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_S7_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2086'/>
-            <parameter type-id='type-id-2869'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2099'/>
+            <parameter type-id='type-id-2894'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='splice' mangled-name='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='1322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE6spliceESt20_List_const_iteratorIS3_EOS5_'>
-            <parameter type-id='type-id-2087' is-artificial='yes'/>
-            <parameter type-id='type-id-2869'/>
-            <parameter type-id='type-id-2086'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2100' is-artificial='yes'/>
+            <parameter type-id='type-id-2894'/>
+            <parameter type-id='type-id-2099'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-2869'/>
+            <parameter type-id='type-id-1184' is-artificial='yes'/>
+            <return type-id='type-id-2894'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS3_EE3endEv'>
-            <parameter type-id='type-id-1172' is-artificial='yes'/>
-            <return type-id='type-id-2869'/>
+            <parameter type-id='type-id-1184' is-artificial='yes'/>
+            <return type-id='type-id-2894'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='lock_guard&lt;std::mutex&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='371' column='1' id='type-id-1179'>
+      <class-decl name='lock_guard&lt;std::mutex&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='371' column='1' id='type-id-1191'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_device' type-id='type-id-2419' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='389' column='1'/>
+          <var-decl name='_M_device' type-id='type-id-2438' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='389' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='lock_guard' mangled-name='_ZNSt10lock_guardISt5mutexEC2ERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10lock_guardISt5mutexEC2ERS0_'>
-            <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2109' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='lock_guard' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <parameter type-id='type-id-2877'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2109' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <parameter type-id='type-id-2902'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~lock_guard' mangled-name='_ZNSt10lock_guardISt5mutexED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10lock_guardISt5mutexED2Ev'>
-            <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2109' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='lock_guard' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2096' is-artificial='yes'/>
-            <parameter type-id='type-id-1181'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2109' is-artificial='yes'/>
+            <parameter type-id='type-id-1193'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='mutex' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='118' column='1' id='type-id-1182'>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1009'/>
+      <class-decl name='mutex' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='118' column='1' id='type-id-1194'>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1021'/>
         <member-type access='private'>
-          <typedef-decl name='native_handle_type' type-id='type-id-1977' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='121' column='1' id='type-id-2878'/>
+          <typedef-decl name='native_handle_type' type-id='type-id-1990' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='121' column='1' id='type-id-2903'/>
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='mutex' mangled-name='_ZNSt5mutexC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5mutexC2Ev'>
-            <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2114' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~mutex' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2114' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='mutex' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <parameter type-id='type-id-1184'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2114' is-artificial='yes'/>
+            <parameter type-id='type-id-1196'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='lock' mangled-name='_ZNSt5mutex4lockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5mutex4lockEv'>
-            <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2114' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unlock' mangled-name='_ZNSt5mutex6unlockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5mutex6unlockEv'>
-            <parameter type-id='type-id-2101' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2114' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1195'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1016'/>
+      <class-decl name='shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1207'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1028'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2ERKS4_'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-1197'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-1209'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2EOS4_'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-2332'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-2351'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-2569'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-2590'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;mongo::repl::ReplicationExecutor::Callback&gt;' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEC2INS0_4repl19ReplicationExecutor8CallbackEEEPT_'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-1504'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-1517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEaSEOS4_'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-2332'/>
-            <return type-id='type-id-2331'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-2351'/>
+            <return type-id='type-id-2350'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-1197'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-1209'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-2332'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-2351'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2333' is-artificial='yes'/>
-            <parameter type-id='type-id-2569'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2352' is-artificial='yes'/>
+            <parameter type-id='type-id-2590'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1198'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1020'/>
+      <class-decl name='shared_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1210'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1032'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2ERKS4_'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-1200'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-1212'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2EOS4_'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2335'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2354'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2572'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2593'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;mongo::repl::ReplicationExecutor::Event, void&gt;' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2INS0_4repl19ReplicationExecutor5EventEvEEOS_IT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEC2INS0_4repl19ReplicationExecutor5EventEvEEOS_IT_E'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2338'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2357'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEaSEOS4_'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2335'/>
-            <return type-id='type-id-2334'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2354'/>
+            <return type-id='type-id-2353'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEaSERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEaSERKS4_'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-1200'/>
-            <return type-id='type-id-2334'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-1212'/>
+            <return type-id='type-id-2353'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-1200'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-1212'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2335'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2354'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2336' is-artificial='yes'/>
-            <parameter type-id='type-id-2572'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2355' is-artificial='yes'/>
+            <parameter type-id='type-id-2593'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1201'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1024'/>
+      <class-decl name='shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1213'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1036'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <parameter type-id='type-id-1203'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <parameter type-id='type-id-1215'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <parameter type-id='type-id-2338'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <parameter type-id='type-id-2357'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <parameter type-id='type-id-2575'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <parameter type-id='type-id-2596'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr&lt;std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt10shared_ptrIN5mongo4repl19ReplicationExecutor5EventEEC2ISaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrIN5mongo4repl19ReplicationExecutor5EventEEC2ISaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEESt19_Sp_make_shared_tagRKT_DpOT0_'>
-            <parameter type-id='type-id-2339' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1048'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2358' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-1060'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1204'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1028'/>
+      <class-decl name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1216'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1040'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <parameter type-id='type-id-1206'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <parameter type-id='type-id-1218'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <parameter type-id='type-id-2341'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <parameter type-id='type-id-2360'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <parameter type-id='type-id-2578'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <parameter type-id='type-id-2599'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt10shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEC2ISaIS9_EJS8_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2342' is-artificial='yes'/>
-            <parameter type-id='type-id-2829'/>
-            <parameter type-id='type-id-1073'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2361' is-artificial='yes'/>
+            <parameter type-id='type-id-2854'/>
+            <parameter type-id='type-id-1085'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='shared_ptr&lt;std::thread::_Impl_base&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1207'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1032'/>
+      <class-decl name='shared_ptr&lt;std::thread::_Impl_base&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='93' column='1' id='type-id-1219'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1044'/>
         <member-function access='public'>
           <function-decl name='shared_ptr' mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2Ev'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <parameter type-id='type-id-1209'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <parameter type-id='type-id-1221'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <parameter type-id='type-id-2344'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <parameter type-id='type-id-2363'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='shared_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <parameter type-id='type-id-2581'/>
-            <parameter type-id='type-id-2828'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <parameter type-id='type-id-2602'/>
+            <parameter type-id='type-id-2853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, void&gt;' mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2INS0_5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEvEEOS_IT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2345' is-artificial='yes'/>
-            <parameter type-id='type-id-2341'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2364' is-artificial='yes'/>
+            <parameter type-id='type-id-2360'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='thread' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='60' column='1' id='type-id-1211'>
+      <class-decl name='thread' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='60' column='1' id='type-id-1223'>
         <member-type access='private'>
-          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='68' column='1' id='type-id-2354'>
+          <class-decl name='id' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='68' column='1' id='type-id-2373'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_M_thread' type-id='type-id-2879' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='70' column='1'/>
+              <var-decl name='_M_thread' type-id='type-id-2904' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='70' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='id' mangled-name='_ZNSt6thread2idC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread2idC2Ev'>
-                <parameter type-id='type-id-2356' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2375' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='id' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2356' is-artificial='yes'/>
-                <parameter type-id='type-id-2879'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2375' is-artificial='yes'/>
+                <parameter type-id='type-id-2904'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='107' column='1' id='type-id-1215'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2351'/>
+          <class-decl name='_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='107' column='1' id='type-id-1227'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2370'/>
             <data-member access='public' layout-offset-in-bits='192'>
-              <var-decl name='_M_func' type-id='type-id-492' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='109' column='1'/>
+              <var-decl name='_M_func' type-id='type-id-504' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='109' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Impl' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2350' is-artificial='yes'/>
-                <parameter type-id='type-id-1573'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2369' is-artificial='yes'/>
+                <parameter type-id='type-id-1586'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' vtable-offset='2'>
               <function-decl name='_M_run' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEE6_M_runEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2350' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2369' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Impl_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='97' column='1' id='type-id-2351'>
+          <class-decl name='_Impl_base' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='97' column='1' id='type-id-2370'>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_this_ptr' type-id='type-id-2880' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='99' column='1'/>
+              <var-decl name='_M_this_ptr' type-id='type-id-2905' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='99' column='1'/>
             </data-member>
             <member-function access='public' destructor='yes' vtable-offset='0'>
               <function-decl name='~_Impl_base' mangled-name='_ZNSt6thread10_Impl_baseD0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD2Ev'>
-                <parameter type-id='type-id-2353' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2372' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' vtable-offset='2'>
               <function-decl name='_M_run' mangled-name='_ZNSt6thread10_Impl_base6_M_runEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2353' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-2372' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__shared_base_type' type-id='type-id-1207' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='65' column='1' id='type-id-2880'/>
+          <typedef-decl name='__shared_base_type' type-id='type-id-1219' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='65' column='1' id='type-id-2905'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='native_handle_type' type-id='type-id-71' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='63' column='1' id='type-id-2879'/>
+          <typedef-decl name='native_handle_type' type-id='type-id-76' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='63' column='1' id='type-id-2904'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_id' type-id='type-id-2354' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='119' column='1'/>
+          <var-decl name='_M_id' type-id='type-id-2373' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='119' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='thread' mangled-name='_ZNSt6threadC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6threadC2Ev'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='thread' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-2346'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-2365'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='thread' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-1213'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-1225'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='thread' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-2347'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-2366'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~thread' mangled-name='_ZNSt6threadD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6threadD2Ev'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='thread&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' mangled-name='_ZNSt6threadC2IZN5mongo4repl19ReplicationExecutor7startupEvE3$_0JEEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='joinable' mangled-name='_ZNKSt6thread8joinableEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6thread8joinableEv'>
-            <parameter type-id='type-id-1214' is-artificial='yes'/>
+            <parameter type-id='type-id-1226' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6threadaSEOS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6threadaSEOS_'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-2347'/>
-            <return type-id='type-id-2346'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-2366'/>
+            <return type-id='type-id-2365'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_make_routine&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt6thread15_M_make_routineISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESt10shared_ptrINS_5_ImplIT_EEEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-1204'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-1216'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6thread4swapERS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread4swapERS_'>
-            <parameter type-id='type-id-2348' is-artificial='yes'/>
-            <parameter type-id='type-id-2346'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2367' is-artificial='yes'/>
+            <parameter type-id='type-id-2365'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1219'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-695'/>
+      <class-decl name='tuple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1231'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2359' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2378' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2359' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2378' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2359' is-artificial='yes'/>
-            <parameter type-id='type-id-1221'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2378' is-artificial='yes'/>
+            <parameter type-id='type-id-1233'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2359' is-artificial='yes'/>
-            <parameter type-id='type-id-2358'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2378' is-artificial='yes'/>
+            <parameter type-id='type-id-2377'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36), void&gt;' mangled-name='_ZNSt5tupleIJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EEC2IJS3_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2359' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2378' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='514' column='1' id='type-id-2360'/>
-      <class-decl name='tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1222'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-701'/>
+      <class-decl name='tuple&lt;&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='514' column='1' id='type-id-2379'/>
+      <class-decl name='tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1234'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-713'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2366' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2385' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ES6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ES6_'>
-            <parameter type-id='type-id-2366' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2385' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2366' is-artificial='yes'/>
-            <parameter type-id='type-id-1224'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2385' is-artificial='yes'/>
+            <parameter type-id='type-id-1236'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2366' is-artificial='yes'/>
-            <parameter type-id='type-id-2365'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2385' is-artificial='yes'/>
+            <parameter type-id='type-id-2384'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1225'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-704'/>
+      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1237'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-716'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-1227'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-1239'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-2368'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-2387'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-1227'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-1239'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2369' is-artificial='yes'/>
-            <parameter type-id='type-id-2368'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2388' is-artificial='yes'/>
+            <parameter type-id='type-id-2387'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1228'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-707'/>
+      <class-decl name='tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1240'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-719'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2372' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2391' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_'>
-            <parameter type-id='type-id-2372' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2391' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2372' is-artificial='yes'/>
-            <parameter type-id='type-id-1230'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2391' is-artificial='yes'/>
+            <parameter type-id='type-id-1242'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2372' is-artificial='yes'/>
-            <parameter type-id='type-id-2371'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2391' is-artificial='yes'/>
+            <parameter type-id='type-id-2390'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::OperationContext *, mongo::Status&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1231'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-713'/>
+      <class-decl name='tuple&lt;mongo::OperationContext *, mongo::Status&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1243'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-725'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2375' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2394' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2375' is-artificial='yes'/>
-            <parameter type-id='type-id-2592'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2394' is-artificial='yes'/>
+            <parameter type-id='type-id-2613'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2ERKS4_'>
-            <parameter type-id='type-id-2375' is-artificial='yes'/>
-            <parameter type-id='type-id-1233'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2394' is-artificial='yes'/>
+            <parameter type-id='type-id-1245'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2EOS4_'>
-            <parameter type-id='type-id-2375' is-artificial='yes'/>
-            <parameter type-id='type-id-2374'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2394' is-artificial='yes'/>
+            <parameter type-id='type-id-2393'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::OperationContext *&amp;, const mongo::Status &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2IRS2_RKS3_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo16OperationContextENS0_6StatusEEEC2IRS2_RKS3_vEEOT_OT0_'>
-            <parameter type-id='type-id-2375' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2394' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1234'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-719'/>
+      <class-decl name='tuple&lt;mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1246'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-731'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2378' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2397' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2378' is-artificial='yes'/>
-            <parameter type-id='type-id-2599'/>
-            <parameter type-id='type-id-1107'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2397' is-artificial='yes'/>
+            <parameter type-id='type-id-2620'/>
+            <parameter type-id='type-id-1119'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2378' is-artificial='yes'/>
-            <parameter type-id='type-id-1236'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2397' is-artificial='yes'/>
+            <parameter type-id='type-id-1248'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2378' is-artificial='yes'/>
-            <parameter type-id='type-id-2377'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2397' is-artificial='yes'/>
+            <parameter type-id='type-id-2396'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::executor::NetworkInterface *&amp;, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-2378' is-artificial='yes'/>
-            <parameter type-id='type-id-2600'/>
-            <parameter type-id='type-id-2047'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2397' is-artificial='yes'/>
+            <parameter type-id='type-id-2621'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1237'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-725'/>
+      <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1249'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-737'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2400' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2400' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS4_'>
-            <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <parameter type-id='type-id-1239'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2400' is-artificial='yes'/>
+            <parameter type-id='type-id-1251'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS4_'>
-            <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <parameter type-id='type-id-2380'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2400' is-artificial='yes'/>
+            <parameter type-id='type-id-2399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackArgs, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IJS3_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IJS3_EvEEDpOT_'>
-            <parameter type-id='type-id-2381' is-artificial='yes'/>
-            <parameter type-id='type-id-1469'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2400' is-artificial='yes'/>
+            <parameter type-id='type-id-1482'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1240'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-728'/>
+      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1252'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-740'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2403' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2403' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2ERKSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2ERKSG_'>
-            <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-1242'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2403' is-artificial='yes'/>
+            <parameter type-id='type-id-1254'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2EOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2EOSG_'>
-            <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-2383'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2403' is-artificial='yes'/>
+            <parameter type-id='type-id-2402'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IJS3_RS5_RKS7_RS9_RmRKSF_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IJS3_RS5_RKS7_RS9_RmRKSF_EvEEDpOT_'>
-            <parameter type-id='type-id-2384' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2403' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1243'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-734'/>
+      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1255'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-746'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2406' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2406' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2ERKSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2ERKSF_'>
-            <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-1245'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2406' is-artificial='yes'/>
+            <parameter type-id='type-id-1257'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2EOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2EOSF_'>
-            <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-2386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2406' is-artificial='yes'/>
+            <parameter type-id='type-id-2405'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IJS3_RKS5_RKS6_RS9_SE_DnEvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IJS3_RKS5_RKS6_RS9_SE_DnEvEEDpOT_'>
-            <parameter type-id='type-id-2387' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2406' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1246'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-740'/>
+      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1258'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-752'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2409' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2409' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2ERKSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2ERKSH_'>
-            <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-1248'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2409' is-artificial='yes'/>
+            <parameter type-id='type-id-1260'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2EOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2EOSH_'>
-            <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-2389'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2409' is-artificial='yes'/>
+            <parameter type-id='type-id-2408'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IJS3_RKS5_RKS6_RS9_SE_SG_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IJS3_RKS5_RKS6_RS9_SE_SG_EvEEDpOT_'>
-            <parameter type-id='type-id-2390' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2409' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1249'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-746'/>
+      <class-decl name='tuple&lt;mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1261'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-758'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2393' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2412' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2393' is-artificial='yes'/>
-            <parameter type-id='type-id-2624'/>
-            <parameter type-id='type-id-1111'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2412' is-artificial='yes'/>
+            <parameter type-id='type-id-2645'/>
+            <parameter type-id='type-id-1123'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2393' is-artificial='yes'/>
-            <parameter type-id='type-id-1251'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2412' is-artificial='yes'/>
+            <parameter type-id='type-id-1263'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2393' is-artificial='yes'/>
-            <parameter type-id='type-id-2392'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2412' is-artificial='yes'/>
+            <parameter type-id='type-id-2411'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::StorageInterface *&amp;, std::default_delete&lt;mongo::repl::StorageInterface&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-2393' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <parameter type-id='type-id-2050'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2412' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <parameter type-id='type-id-2063'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1252'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-752'/>
+      <class-decl name='tuple&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1264'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-764'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2396' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2415' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2396' is-artificial='yes'/>
-            <parameter type-id='type-id-2624'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2415' is-artificial='yes'/>
+            <parameter type-id='type-id-2645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2396' is-artificial='yes'/>
-            <parameter type-id='type-id-1254'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2415' is-artificial='yes'/>
+            <parameter type-id='type-id-1266'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceEEEC2EOS4_'>
-            <parameter type-id='type-id-2396' is-artificial='yes'/>
-            <parameter type-id='type-id-2395'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2415' is-artificial='yes'/>
+            <parameter type-id='type-id-2414'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::StorageInterface *&amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceEEEC2IJRS3_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl16StorageInterfaceEEEC2IJRS3_EvEEDpOT_'>
-            <parameter type-id='type-id-2396' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2415' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1255'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-755'/>
+      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1267'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-767'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2399' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2418' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKS1_RKSA_RKSB_RKSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKS1_RKSA_RKSB_RKSE_'>
-            <parameter type-id='type-id-2399' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2418' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKSF_'>
-            <parameter type-id='type-id-2399' is-artificial='yes'/>
-            <parameter type-id='type-id-1257'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2418' is-artificial='yes'/>
+            <parameter type-id='type-id-1269'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2EOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2EOSF_'>
-            <parameter type-id='type-id-2399' is-artificial='yes'/>
-            <parameter type-id='type-id-2398'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2418' is-artificial='yes'/>
+            <parameter type-id='type-id-2417'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1258'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-761'/>
+      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1270'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-773'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2402' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2421' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2402' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2421' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2ERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2ERKSC_'>
-            <parameter type-id='type-id-2402' is-artificial='yes'/>
-            <parameter type-id='type-id-1260'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2421' is-artificial='yes'/>
+            <parameter type-id='type-id-1272'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2EOSC_'>
-            <parameter type-id='type-id-2402' is-artificial='yes'/>
-            <parameter type-id='type-id-2401'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2421' is-artificial='yes'/>
+            <parameter type-id='type-id-2420'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2IJRKS1_RKSA_RSB_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2IJRKS1_RKSA_RSB_EvEEDpOT_'>
-            <parameter type-id='type-id-2402' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2421' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1261'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-767'/>
+      <class-decl name='tuple&lt;std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1273'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-779'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2405' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2424' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2405' is-artificial='yes'/>
-            <parameter type-id='type-id-2636'/>
-            <parameter type-id='type-id-1115'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2424' is-artificial='yes'/>
+            <parameter type-id='type-id-2658'/>
+            <parameter type-id='type-id-1127'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2405' is-artificial='yes'/>
-            <parameter type-id='type-id-1263'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2424' is-artificial='yes'/>
+            <parameter type-id='type-id-1275'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2405' is-artificial='yes'/>
-            <parameter type-id='type-id-2404'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2424' is-artificial='yes'/>
+            <parameter type-id='type-id-2423'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1264'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-773'/>
+      <class-decl name='tuple&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-1276'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-785'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2408' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2427' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt8functionIFvvEEEEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt8functionIFvvEEEEC2ERKS2_'>
-            <parameter type-id='type-id-2408' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2427' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt8functionIFvvEEEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt8functionIFvvEEEEC2ERKS3_'>
-            <parameter type-id='type-id-2408' is-artificial='yes'/>
-            <parameter type-id='type-id-1266'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2427' is-artificial='yes'/>
+            <parameter type-id='type-id-1278'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt8functionIFvvEEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt8functionIFvvEEEEC2EOS3_'>
-            <parameter type-id='type-id-2408' is-artificial='yes'/>
-            <parameter type-id='type-id-2407'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2427' is-artificial='yes'/>
+            <parameter type-id='type-id-2426'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1267'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-776'/>
+      <class-decl name='tuple&lt;std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1279'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2411' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2430' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2411' is-artificial='yes'/>
-            <parameter type-id='type-id-2098'/>
-            <parameter type-id='type-id-1119'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2430' is-artificial='yes'/>
+            <parameter type-id='type-id-2111'/>
+            <parameter type-id='type-id-1131'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2411' is-artificial='yes'/>
-            <parameter type-id='type-id-1269'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2430' is-artificial='yes'/>
+            <parameter type-id='type-id-1281'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2411' is-artificial='yes'/>
-            <parameter type-id='type-id-2410'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2430' is-artificial='yes'/>
+            <parameter type-id='type-id-2429'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;std::lock_guard&lt;std::mutex&gt; *&amp;, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, void&gt;' mangled-name='_ZNSt5tupleIJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEEC2IRS3_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-2411' is-artificial='yes'/>
-            <parameter type-id='type-id-2099'/>
-            <parameter type-id='type-id-2055'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2430' is-artificial='yes'/>
+            <parameter type-id='type-id-2112'/>
+            <parameter type-id='type-id-2068'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1270'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-782'/>
+      <class-decl name='tuple&lt;unsigned int, unsigned int&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-1282'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-794'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1272'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1284'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-2413'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-2432'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1272'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1284'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-2413'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-2432'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-1272'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-1284'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2414' is-artificial='yes'/>
-            <parameter type-id='type-id-2413'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2433' is-artificial='yes'/>
+            <parameter type-id='type-id-2432'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='394' column='1' id='type-id-1273'>
+      <class-decl name='unique_lock&lt;std::mutex&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='394' column='1' id='type-id-1285'>
         <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-1182' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='397' column='1' id='type-id-2418'/>
+          <typedef-decl name='mutex_type' type-id='type-id-1194' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='397' column='1' id='type-id-2437'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_device' type-id='type-id-2420' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='563' column='1'/>
+          <var-decl name='_M_device' type-id='type-id-2439' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='563' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_owns' type-id='type-id-1' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='564' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' mangled-name='_ZNSt11unique_lockISt5mutexEC2ERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11unique_lockISt5mutexEC2ERS0_'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <parameter type-id='type-id-2881'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <parameter type-id='type-id-2906'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <parameter type-id='type-id-2882'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <parameter type-id='type-id-2907'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='418' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-2419'/>
-            <parameter type-id='type-id-2877'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-2438'/>
+            <parameter type-id='type-id-2902'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_lock' mangled-name='_ZNSt11unique_lockISt5mutexED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11unique_lockISt5mutexED2Ev'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='442' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-1275'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-1287'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_lock' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='445' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <parameter type-id='type-id-2416'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <parameter type-id='type-id-2435'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unlock' mangled-name='_ZNSt11unique_lockISt5mutexE6unlockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11unique_lockISt5mutexE6unlockEv'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='lock' mangled-name='_ZNSt11unique_lockISt5mutexE4lockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11unique_lockISt5mutexE4lockEv'>
-            <parameter type-id='type-id-2417' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2436' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;mongo::executor::NetworkInterface, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1277'>
+      <class-decl name='unique_ptr&lt;mongo::executor::NetworkInterface, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1289'>
         <member-type access='private'>
-          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2883'>
+          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2908'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2884'/>
+              <typedef-decl name='type' type-id='type-id-2618' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2909'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1234' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2885'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1246' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2910'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='deleter_type' type-id='type-id-1105' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1281'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1293'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2886'/>
+          <typedef-decl name='pointer' type-id='type-id-2909' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2911'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-2885' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-2910' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEC2EPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEC2EPS2_'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <parameter type-id='type-id-2886'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <parameter type-id='type-id-2911'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <parameter type-id='type-id-2886'/>
-            <parameter type-id='type-id-2887'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <parameter type-id='type-id-2911'/>
+            <parameter type-id='type-id-2912'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <parameter type-id='type-id-2886'/>
-            <parameter type-id='type-id-2262'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <parameter type-id='type-id-2911'/>
+            <parameter type-id='type-id-2277'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <parameter type-id='type-id-2422'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <parameter type-id='type-id-2441'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EED2Ev'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <parameter type-id='type-id-1279'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <parameter type-id='type-id-1291'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEptEv'>
-            <parameter type-id='type-id-1280' is-artificial='yes'/>
-            <return type-id='type-id-2886'/>
+            <parameter type-id='type-id-1292' is-artificial='yes'/>
+            <return type-id='type-id-2911'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EE3getEv'>
-            <parameter type-id='type-id-1280' is-artificial='yes'/>
-            <return type-id='type-id-2886'/>
+            <parameter type-id='type-id-1292' is-artificial='yes'/>
+            <return type-id='type-id-2911'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_deleter' mangled-name='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EE11get_deleterEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EE11get_deleterEv'>
-            <parameter type-id='type-id-2423' is-artificial='yes'/>
-            <return type-id='type-id-2424'/>
+            <parameter type-id='type-id-2442' is-artificial='yes'/>
+            <return type-id='type-id-2443'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;mongo::repl::StorageInterface, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1284'>
+      <class-decl name='unique_ptr&lt;mongo::repl::StorageInterface, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1296'>
         <member-type access='private'>
-          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2888'>
+          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2913'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2622' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2889'/>
+              <typedef-decl name='type' type-id='type-id-2642' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2914'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1249' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2890'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1261' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2915'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='deleter_type' type-id='type-id-1109' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1288'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1300'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2889' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2891'/>
+          <typedef-decl name='pointer' type-id='type-id-2914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2916'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-2890' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-2915' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEC2EPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEC2EPS2_'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <parameter type-id='type-id-2891'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <parameter type-id='type-id-2891'/>
-            <parameter type-id='type-id-2892'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2917'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <parameter type-id='type-id-2891'/>
-            <parameter type-id='type-id-2265'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2280'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <parameter type-id='type-id-2426'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <parameter type-id='type-id-2445'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EED2Ev'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <parameter type-id='type-id-1286'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <parameter type-id='type-id-1298'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_deleter' mangled-name='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EE11get_deleterEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrIN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EE11get_deleterEv'>
-            <parameter type-id='type-id-2427' is-artificial='yes'/>
-            <return type-id='type-id-2428'/>
+            <parameter type-id='type-id-2446' is-artificial='yes'/>
+            <return type-id='type-id-2447'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char&gt;, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1291'>
+      <class-decl name='unique_ptr&lt;std::basic_ostringstream&lt;char&gt;, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1303'>
         <member-type access='private'>
-          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2893'>
+          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2918'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-2634' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2894'/>
+              <typedef-decl name='type' type-id='type-id-2656' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='143' column='1' id='type-id-2919'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1261' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2895'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1273' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2920'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='deleter_type' type-id='type-id-1113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1295'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1125' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1307'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2894' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2896'/>
+          <typedef-decl name='pointer' type-id='type-id-2919' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2921'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-2895' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-2920' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <parameter type-id='type-id-2896'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <parameter type-id='type-id-2921'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <parameter type-id='type-id-2896'/>
-            <parameter type-id='type-id-2897'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <parameter type-id='type-id-2921'/>
+            <parameter type-id='type-id-2922'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <parameter type-id='type-id-2896'/>
-            <parameter type-id='type-id-2267'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <parameter type-id='type-id-2921'/>
+            <parameter type-id='type-id-2282'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <parameter type-id='type-id-2430'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <parameter type-id='type-id-2449'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2431' is-artificial='yes'/>
-            <parameter type-id='type-id-1293'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2450' is-artificial='yes'/>
+            <parameter type-id='type-id-1305'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEcvbEv'>
-            <parameter type-id='type-id-1294' is-artificial='yes'/>
+            <parameter type-id='type-id-1306' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEdeEv'>
-            <parameter type-id='type-id-1294' is-artificial='yes'/>
-            <return type-id='type-id-2898'/>
+            <parameter type-id='type-id-1306' is-artificial='yes'/>
+            <return type-id='type-id-2923'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt10unique_ptrISt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EE3getEv'>
-            <parameter type-id='type-id-1294' is-artificial='yes'/>
-            <return type-id='type-id-2896'/>
+            <parameter type-id='type-id-1306' is-artificial='yes'/>
+            <return type-id='type-id-2921'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;std::lock_guard&lt;std::mutex&gt;, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1298'>
+      <class-decl name='unique_ptr&lt;std::lock_guard&lt;std::mutex&gt;, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='129' column='1' id='type-id-1310'>
         <member-type access='private'>
-          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2899'>
+          <class-decl name='_Pointer' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='132' column='1' id='type-id-2924'>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__tuple_type' type-id='type-id-1267' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2900'/>
+          <typedef-decl name='__tuple_type' type-id='type-id-1279' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='146' column='1' id='type-id-2925'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='deleter_type' type-id='type-id-1117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1302'/>
+          <typedef-decl name='deleter_type' type-id='type-id-1129' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='152' column='1' id='type-id-1314'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2281' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2901'/>
+          <typedef-decl name='pointer' type-id='type-id-2296' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='150' column='1' id='type-id-2926'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_t' type-id='type-id-2900' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
+          <var-decl name='_M_t' type-id='type-id-2925' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='147' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EEC2EPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EEC2EPS2_'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <parameter type-id='type-id-2901'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <parameter type-id='type-id-2926'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <parameter type-id='type-id-2901'/>
-            <parameter type-id='type-id-2902'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <parameter type-id='type-id-2926'/>
+            <parameter type-id='type-id-2927'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <parameter type-id='type-id-2901'/>
-            <parameter type-id='type-id-2270'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <parameter type-id='type-id-2926'/>
+            <parameter type-id='type-id-2285'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <parameter type-id='type-id-2434'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <parameter type-id='type-id-2453'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~unique_ptr' mangled-name='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EED2Ev'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unique_ptr' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <parameter type-id='type-id-1300'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <parameter type-id='type-id-1312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_deleter' mangled-name='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EE11get_deleterEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10unique_ptrISt10lock_guardISt5mutexESt14default_deleteIS2_EE11get_deleterEv'>
-            <parameter type-id='type-id-2435' is-artificial='yes'/>
-            <return type-id='type-id-2436'/>
+            <parameter type-id='type-id-2454' is-artificial='yes'/>
+            <return type-id='type-id-2455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unordered_map&lt;std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *, std::hash&lt;string&gt;, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1305'>
+      <class-decl name='unordered_map&lt;std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *, std::hash&lt;string&gt;, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' size-in-bits='448' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='98' column='1' id='type-id-1317'>
         <member-type access='private'>
-          <typedef-decl name='_Hashtable' type-id='type-id-2904' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-2903'/>
+          <typedef-decl name='_Hashtable' type-id='type-id-2929' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='100' column='1' id='type-id-2928'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1309'/>
+          <typedef-decl name='allocator_type' type-id='type-id-517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='112' column='1' id='type-id-1321'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='hasher' type-id='type-id-2905' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1312'/>
+          <typedef-decl name='hasher' type-id='type-id-2930' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='110' column='1' id='type-id-1324'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_equal' type-id='type-id-508' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1315'/>
+          <typedef-decl name='key_equal' type-id='type-id-520' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='111' column='1' id='type-id-1327'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='mapped_type' type-id='type-id-992' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1318'/>
+          <typedef-decl name='mapped_type' type-id='type-id-1004' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='109' column='1' id='type-id-1330'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-2783' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2906'/>
+          <typedef-decl name='size_type' type-id='type-id-2805' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='125' column='1' id='type-id-2931'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-2907'/>
+          <typedef-decl name='const_iterator' type-id='type-id-2806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='122' column='1' id='type-id-2932'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_local_iterator' type-id='type-id-2786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='124' column='1' id='type-id-2908'/>
+          <typedef-decl name='const_local_iterator' type-id='type-id-2808' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='124' column='1' id='type-id-2933'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-2788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='121' column='1' id='type-id-2909'/>
+          <typedef-decl name='iterator' type-id='type-id-2810' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='121' column='1' id='type-id-2934'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_type' type-id='type-id-2525' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='107' column='1' id='type-id-2561'/>
+          <typedef-decl name='key_type' type-id='type-id-2546' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='107' column='1' id='type-id-2582'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='local_iterator' type-id='type-id-2790' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='123' column='1' id='type-id-2910'/>
+          <typedef-decl name='local_iterator' type-id='type-id-2812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='123' column='1' id='type-id-2935'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_h' type-id='type-id-2903' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='101' column='1'/>
+          <var-decl name='_M_h' type-id='type-id-2928' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='101' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-2906'/>
-            <parameter type-id='type-id-1314'/>
-            <parameter type-id='type-id-1317'/>
-            <parameter type-id='type-id-1311'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-2931'/>
+            <parameter type-id='type-id-1326'/>
+            <parameter type-id='type-id-1329'/>
+            <parameter type-id='type-id-1323'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-1307'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-1319'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-2438'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-2457'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-1311'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-1323'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-1307'/>
-            <parameter type-id='type-id-1311'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-1319'/>
+            <parameter type-id='type-id-1323'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-2438'/>
-            <parameter type-id='type-id-1311'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-2457'/>
+            <parameter type-id='type-id-1323'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='unordered_map' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2439' is-artificial='yes'/>
-            <parameter type-id='type-id-2792'/>
-            <parameter type-id='type-id-2906'/>
-            <parameter type-id='type-id-1314'/>
-            <parameter type-id='type-id-1317'/>
-            <parameter type-id='type-id-1311'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2458' is-artificial='yes'/>
+            <parameter type-id='type-id-2814'/>
+            <parameter type-id='type-id-2931'/>
+            <parameter type-id='type-id-1326'/>
+            <parameter type-id='type-id-1329'/>
+            <parameter type-id='type-id-1323'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1321'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-926'/>
+      <class-decl name='vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-1333'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-938'/>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-2732' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2911'/>
+          <typedef-decl name='const_iterator' type-id='type-id-2754' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-2936'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-2727' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2912'/>
+          <typedef-decl name='const_reference' type-id='type-id-2749' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-2937'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-2914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2913'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-2939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-2938'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-2731' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2915'/>
+          <typedef-decl name='iterator' type-id='type-id-2753' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-2940'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2917' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2916'/>
+          <typedef-decl name='pointer' type-id='type-id-2942' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-2941'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-2730' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2918'/>
+          <typedef-decl name='reference' type-id='type-id-2752' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-2943'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-2920' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2919'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-2945' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-2944'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-2612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-2564'/>
+          <typedef-decl name='value_type' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='226' column='1' id='type-id-2585'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-2566'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-2587'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-1323'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-1335'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-2442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-2461'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-1323'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-1335'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-2442'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-2461'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <parameter type-id='type-id-2921'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <parameter type-id='type-id-2946'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2443' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2462' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='103' column='1' id='type-id-2922'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='103' column='1' id='type-id-2947'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='_S_app' value='1'/>
         <enumerator name='_S_ate' value='2'/>
         <enumerator name='_S_bin' value='4'/>
@@ -10489,15 +10523,15 @@
         <enumerator name='_S_trunc' value='32'/>
         <enumerator name='_S_ios_openmode_end' value='65536'/>
       </enum-decl>
-      <enum-decl name='_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1783' column='1' id='type-id-2748'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='_Manager_operation' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1783' column='1' id='type-id-2770'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='__get_type_info' value='0'/>
         <enumerator name='__get_functor_ptr' value='1'/>
         <enumerator name='__clone_functor' value='2'/>
         <enumerator name='__destroy_functor' value='3'/>
       </enum-decl>
-      <enum-decl name='memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='56' column='1' id='type-id-2923'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='56' column='1' id='type-id-2948'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='memory_order_relaxed' value='0'/>
         <enumerator name='memory_order_consume' value='1'/>
         <enumerator name='memory_order_acquire' value='2'/>
@@ -10505,8268 +10539,8294 @@
         <enumerator name='memory_order_acq_rel' value='4'/>
         <enumerator name='memory_order_seq_cst' value='5'/>
       </enum-decl>
-      <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2924'>
+      <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2949'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-462' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2171'/>
+          <typedef-decl name='type' type-id='type-id-474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2186'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2925'>
+      <class-decl name='_Bind_helper&lt;false, const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2950'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-465' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2173'/>
+          <typedef-decl name='type' type-id='type-id-477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2188'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;, mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2926'>
+      <class-decl name='_Bind_helper&lt;false, const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;, mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2951'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-480' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2183'/>
+          <typedef-decl name='type' type-id='type-id-492' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2198'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, mongo::OperationContext *(mongo::repl::StorageInterface::*)(), mongo::repl::StorageInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2927'>
+      <class-decl name='_Bind_helper&lt;false, mongo::OperationContext *(mongo::repl::StorageInterface::*)(), mongo::repl::StorageInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2952'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2175'/>
+          <typedef-decl name='type' type-id='type-id-480' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2190'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2928'>
+      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2953'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-483' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2185'/>
+          <typedef-decl name='type' type-id='type-id-495' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2200'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2929'>
+      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2954'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-486' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2187'/>
+          <typedef-decl name='type' type-id='type-id-498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2202'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const std::function&lt;void ()&gt; &amp;), const std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2930'>
+      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const std::function&lt;void ()&gt; &amp;), const std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2955'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-489' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2190'/>
+          <typedef-decl name='type' type-id='type-id-501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2205'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;), mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2931'>
+      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;), mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2956'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2177'/>
+          <typedef-decl name='type' type-id='type-id-483' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2192'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2932'>
+      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2957'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2179'/>
+          <typedef-decl name='type' type-id='type-id-486' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2194'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2933'>
+      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-2958'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2181'/>
+          <typedef-decl name='type' type-id='type-id-489' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-2196'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1663' column='1' id='type-id-492'>
+      <class-decl name='_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1663' column='1' id='type-id-504'>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1665' column='1' id='type-id-2934'/>
+          <typedef-decl name='result_type' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1665' column='1' id='type-id-2959'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_bound' type-id='type-id-1219' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1703' column='1'/>
+          <var-decl name='_M_bound' type-id='type-id-1231' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1703' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind_simple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1681' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-494'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
+            <parameter type-id='type-id-506'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind_simple' mangled-name='_ZNSt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1682' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind_simple&lt;, void&gt;' mangled-name='_ZNSt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEC2IJEvEEOS3_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1677' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNSt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEclEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1685' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <return type-id='type-id-2934'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
+            <return type-id='type-id-2959'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_invoke&lt;&gt;' mangled-name='_ZNSt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEE9_M_invokeIJEEEvSt12_Index_tupleIJXspT_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1574' is-artificial='yes'/>
-            <parameter type-id='type-id-2935'/>
-            <return type-id='type-id-2515'/>
+            <parameter type-id='type-id-1587' is-artificial='yes'/>
+            <parameter type-id='type-id-2960'/>
+            <return type-id='type-id-2536'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, (lambda at src/mongo/db/repl/replication_executor.cpp:125:36), false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-511'>
+      <class-decl name='_Head_base&lt;0, (lambda at src/mongo/db/repl/replication_executor.cpp:125:36), false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-523'>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-513'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-525'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-1586'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-1599'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' mangled-name='_ZNSt10_Head_baseILm0EZN5mongo4repl19ReplicationExecutor7startupEvE3$_0Lb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1587' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1600' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EZN5mongo4repl19ReplicationExecutor7startupEvE3$_0Lb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1585'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1598'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-514'>
+      <class-decl name='_Head_base&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-526'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-360' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-373' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1590' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ES6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ES6_'>
-            <parameter type-id='type-id-1590' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1590' is-artificial='yes'/>
-            <parameter type-id='type-id-516'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <parameter type-id='type-id-528'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1590' is-artificial='yes'/>
-            <parameter type-id='type-id-1589'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <parameter type-id='type-id-1602'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1590' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1603' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS7_'>
-            <parameter type-id='type-id-1588'/>
-            <return type-id='type-id-360'/>
+            <parameter type-id='type-id-1601'/>
+            <return type-id='type-id-373'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-517'>
+      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-529'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-394' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-407' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2ES5_'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-531'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-1592'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-1605'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS6_'>
-            <parameter type-id='type-id-1591'/>
-            <return type-id='type-id-394'/>
+            <parameter type-id='type-id-1604'/>
+            <return type-id='type-id-407'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-519'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-531'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-1592'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-1605'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1593' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1606' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::OperationContext *&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-520'>
+      <class-decl name='_Head_base&lt;0, mongo::OperationContext *&amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-532'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2593' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2614' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERPN5mongo16OperationContextELb0EEC2ES3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERPN5mongo16OperationContextELb0EEC2ES3_'>
-            <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <parameter type-id='type-id-522'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <parameter type-id='type-id-534'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <parameter type-id='type-id-1595'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <parameter type-id='type-id-1608'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1596' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1609' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERPN5mongo16OperationContextELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERPN5mongo16OperationContextELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1594'/>
-            <return type-id='type-id-2593'/>
+            <parameter type-id='type-id-1607'/>
+            <return type-id='type-id-2614'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::OperationContext *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-523'>
+      <class-decl name='_Head_base&lt;0, mongo::OperationContext *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-535'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2589' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2610' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-2592'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-2613'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-525'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-537'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-1598'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-1611'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::OperationContext *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EEC2IS2_EEOT_'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-2594'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-2615'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::OperationContext *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EEC2IRS2_EEOT_'>
-            <parameter type-id='type-id-1599' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1612' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo16OperationContextELb0EE7_M_headERS3_'>
-            <parameter type-id='type-id-1597'/>
-            <return type-id='type-id-2593'/>
+            <parameter type-id='type-id-1610'/>
+            <return type-id='type-id-2614'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::executor::NetworkInterface *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-526'>
+      <class-decl name='_Head_base&lt;0, mongo::executor::NetworkInterface *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-538'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2597' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2618' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <parameter type-id='type-id-2599'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-2620'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <parameter type-id='type-id-528'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-540'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <parameter type-id='type-id-1601'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-1614'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::NetworkInterface *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EEC2IRS3_EEOT_'>
-            <parameter type-id='type-id-1602' is-artificial='yes'/>
-            <parameter type-id='type-id-2600'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1615' is-artificial='yes'/>
+            <parameter type-id='type-id-2621'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EE7_M_headERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EE7_M_headERKS4_'>
-            <parameter type-id='type-id-528'/>
-            <return type-id='type-id-2599'/>
+            <parameter type-id='type-id-540'/>
+            <return type-id='type-id-2620'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo8executor16NetworkInterfaceELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1600'/>
-            <return type-id='type-id-2600'/>
+            <parameter type-id='type-id-1613'/>
+            <return type-id='type-id-2621'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackArgs, false&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-529'>
+      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackArgs, false&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-541'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-392' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-405' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2ERKS4_'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-531'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-543'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-1604'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1617'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-1605' is-artificial='yes'/>
-            <parameter type-id='type-id-1469'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1618' is-artificial='yes'/>
+            <parameter type-id='type-id-1482'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EN5mongo8executor12TaskExecutor12CallbackArgsELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1603'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1616'/>
+            <return type-id='type-id-1481'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::repl::ReplicationExecutor *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-532'>
+      <class-decl name='_Head_base&lt;0, mongo::repl::ReplicationExecutor *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-544'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1498' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1511' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-534'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-546'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1620'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1606'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1619'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-534'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-546'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1607'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1620'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&gt;' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl19ReplicationExecutorELb0EEC2IRS3_EEOT_'>
-            <parameter type-id='type-id-1608' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1621' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::repl::StorageInterface *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-535'>
+      <class-decl name='_Head_base&lt;0, mongo::repl::StorageInterface *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-547'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2622' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2642' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-2624'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-2645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-537'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-549'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-1610'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-1623'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::StorageInterface *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-2626'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-2647'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EEC2IRS3_EEOT_'>
-            <parameter type-id='type-id-1611' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1624' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPN5mongo4repl16StorageInterfaceELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1609'/>
-            <return type-id='type-id-2625'/>
+            <parameter type-id='type-id-1622'/>
+            <return type-id='type-id-2646'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-538'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-674'/>
+      <class-decl name='_Head_base&lt;0, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-550'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-686'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EEC2ERKS1_'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-540'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-552'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-1613'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1626'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt12_PlaceholderILi1EELb1EE7_M_headERS2_'>
-            <parameter type-id='type-id-1612'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1625'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-540'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-552'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-1613'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1626'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;1&gt; &gt;' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1614' is-artificial='yes'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1627' is-artificial='yes'/>
+            <parameter type-id='type-id-1735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, std::basic_ostringstream&lt;char&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-541'>
+      <class-decl name='_Head_base&lt;0, std::basic_ostringstream&lt;char&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-553'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2634' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2656' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-2636'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-2658'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-543'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-555'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-1616'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-1629'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1617' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1630' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEELb0EE7_M_headERKS6_'>
-            <parameter type-id='type-id-543'/>
-            <return type-id='type-id-2636'/>
+            <parameter type-id='type-id-555'/>
+            <return type-id='type-id-2658'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, std::function&lt;void ()&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-544'>
+      <class-decl name='_Head_base&lt;0, std::function&lt;void ()&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-556'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1133' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1145' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2ERKS2_'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2ERKS3_'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <parameter type-id='type-id-546'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-558'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <parameter type-id='type-id-1619'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-1632'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::function&lt;void ()&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EEC2IS2_EEOT_'>
-            <parameter type-id='type-id-1620' is-artificial='yes'/>
-            <parameter type-id='type-id-2065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1633' is-artificial='yes'/>
+            <parameter type-id='type-id-2078'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ESt8functionIFvvEELb0EE7_M_headERS3_'>
-            <parameter type-id='type-id-1618'/>
-            <return type-id='type-id-2064'/>
+            <parameter type-id='type-id-1631'/>
+            <return type-id='type-id-2077'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, std::lock_guard&lt;std::mutex&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-547'>
+      <class-decl name='_Head_base&lt;0, std::lock_guard&lt;std::mutex&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-559'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2096' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2109' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <parameter type-id='type-id-2098'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-2111'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <parameter type-id='type-id-549'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-561'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <parameter type-id='type-id-1622'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-1635'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::lock_guard&lt;std::mutex&gt; *&amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EPSt10lock_guardISt5mutexELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPSt10lock_guardISt5mutexELb0EEC2IRS3_EEOT_'>
-            <parameter type-id='type-id-1623' is-artificial='yes'/>
-            <parameter type-id='type-id-2099'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1636' is-artificial='yes'/>
+            <parameter type-id='type-id-2112'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0EPSt10lock_guardISt5mutexELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0EPSt10lock_guardISt5mutexELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1621'/>
-            <return type-id='type-id-2099'/>
+            <parameter type-id='type-id-1634'/>
+            <return type-id='type-id-2112'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-550'>
+      <class-decl name='_Head_base&lt;0, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-562'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-48' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-53' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1626' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1626' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1626' is-artificial='yes'/>
-            <parameter type-id='type-id-552'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-564'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1626' is-artificial='yes'/>
-            <parameter type-id='type-id-1625'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-1638'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1626' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1639' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, mongo::Status &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-553'>
+      <class-decl name='_Head_base&lt;1, mongo::Status &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-565'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1442' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1455' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EEC2ES2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EEC2ES2_'>
-            <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-555'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-567'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-1628'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-1641'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1629' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1642' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ERN5mongo6StatusELb0EE7_M_headERS3_'>
-            <parameter type-id='type-id-1627'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1640'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, mongo::Status, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-556'>
+      <class-decl name='_Head_base&lt;1, mongo::Status, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-568'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-354' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-367' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2ERKS1_'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2ERKS2_'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-558'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-570'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-1631'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-1644'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::Status&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1632' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1645' is-artificial='yes'/>
+            <parameter type-id='type-id-1456'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo6StatusELb0EE7_M_headERS2_'>
-            <parameter type-id='type-id-1630'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1643'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, mongo::executor::RemoteCommandRequest, false&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-559'>
+      <class-decl name='_Head_base&lt;1, mongo::executor::RemoteCommandRequest, false&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-571'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-397' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS3_'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-561'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-573'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-1634'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-1647'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_'>
-            <parameter type-id='type-id-1635' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1648' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_'>
-            <parameter type-id='type-id-1633'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1646'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-562'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-674'/>
+      <class-decl name='_Head_base&lt;1, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-574'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-686'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EEC2ERKS1_'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-564'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-576'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-1637'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-1650'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-1735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt12_PlaceholderILi1EELb1EE7_M_headERS2_'>
-            <parameter type-id='type-id-1636'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1649'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-564'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-576'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-1637'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-1650'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;1&gt; &gt;' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1638' is-artificial='yes'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1651' is-artificial='yes'/>
+            <parameter type-id='type-id-1735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-565'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1105'/>
+      <class-decl name='_Head_base&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-577'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1117'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <parameter type-id='type-id-1107'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <parameter type-id='type-id-1119'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <parameter type-id='type-id-567'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <parameter type-id='type-id-579'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <parameter type-id='type-id-1640'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <parameter type-id='type-id-1653'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEELb1EEC2IS4_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEELb1EEC2IS4_EEOT_'>
-            <parameter type-id='type-id-1641' is-artificial='yes'/>
-            <parameter type-id='type-id-2047'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1654' is-artificial='yes'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEELb1EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEELb1EE7_M_headERS5_'>
-            <parameter type-id='type-id-1639'/>
-            <return type-id='type-id-2046'/>
+            <parameter type-id='type-id-1652'/>
+            <return type-id='type-id-2059'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-568'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1109'/>
+      <class-decl name='_Head_base&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-580'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1121'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1111'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <parameter type-id='type-id-1123'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-570'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <parameter type-id='type-id-582'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-1643'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <parameter type-id='type-id-1656'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEELb1EEC2IS4_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEELb1EEC2IS4_EEOT_'>
-            <parameter type-id='type-id-1644' is-artificial='yes'/>
-            <parameter type-id='type-id-2050'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1657' is-artificial='yes'/>
+            <parameter type-id='type-id-2063'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEELb1EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEELb1EE7_M_headERS5_'>
-            <parameter type-id='type-id-1642'/>
-            <return type-id='type-id-2049'/>
+            <parameter type-id='type-id-1655'/>
+            <return type-id='type-id-2062'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-571'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1113'/>
+      <class-decl name='_Head_base&lt;1, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-583'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1125'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1660' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-1115'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1660' is-artificial='yes'/>
+            <parameter type-id='type-id-1127'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-573'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1660' is-artificial='yes'/>
+            <parameter type-id='type-id-585'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-1646'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1660' is-artificial='yes'/>
+            <parameter type-id='type-id-1659'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1647' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1660' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-574'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1117'/>
+      <class-decl name='_Head_base&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-586'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1129'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-1119'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1131'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-576'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-588'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-1649'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-1662'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteISt10lock_guardISt5mutexEELb1EEC2IS4_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteISt10lock_guardISt5mutexEELb1EEC2IS4_EEOT_'>
-            <parameter type-id='type-id-1650' is-artificial='yes'/>
-            <parameter type-id='type-id-2055'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1663' is-artificial='yes'/>
+            <parameter type-id='type-id-2068'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ESt14default_deleteISt10lock_guardISt5mutexEELb1EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt14default_deleteISt10lock_guardISt5mutexEELb1EE7_M_headERS5_'>
-            <parameter type-id='type-id-1648'/>
-            <return type-id='type-id-2054'/>
+            <parameter type-id='type-id-1661'/>
+            <return type-id='type-id-2067'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-577'>
+      <class-decl name='_Head_base&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-589'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1145' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1157' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS8_'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS9_'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-579'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <parameter type-id='type-id-591'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-1652'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <parameter type-id='type-id-1665'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2IS8_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2IS8_EEOT_'>
-            <parameter type-id='type-id-1653' is-artificial='yes'/>
-            <parameter type-id='type-id-2074'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1666' is-artificial='yes'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EE7_M_headERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EE7_M_headERS9_'>
-            <parameter type-id='type-id-1651'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1664'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-580'>
+      <class-decl name='_Head_base&lt;1, unsigned int, false&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-592'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-48' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-53' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1656' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1656' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1656' is-artificial='yes'/>
-            <parameter type-id='type-id-582'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-594'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1656' is-artificial='yes'/>
-            <parameter type-id='type-id-1655'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-1668'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1656' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1669' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;2, mongo::executor::RemoteCommandRequest, false&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-583'>
+      <class-decl name='_Head_base&lt;2, mongo::executor::RemoteCommandRequest, false&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-595'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-384' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-397' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS2_'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2ERKS3_'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-585'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-597'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-1658'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1671'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IS2_EEOT_'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-1463'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1476'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EEC2IRS2_EEOT_'>
-            <parameter type-id='type-id-1659' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1672' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EN5mongo8executor20RemoteCommandRequestELb0EE7_M_headERS3_'>
-            <parameter type-id='type-id-1657'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1670'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;2, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-586'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-674'/>
+      <class-decl name='_Head_base&lt;2, std::_Placeholder&lt;1&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-598'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-686'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EEC2ERKS1_'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <parameter type-id='type-id-588'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-600'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <parameter type-id='type-id-1661'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1674'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1662' is-artificial='yes'/>
-            <parameter type-id='type-id-1722'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1675' is-artificial='yes'/>
+            <parameter type-id='type-id-1735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi1EELb1EE7_M_headERS2_'>
-            <parameter type-id='type-id-1660'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1673'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;2, std::_Placeholder&lt;2&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-589'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-677'/>
+      <class-decl name='_Head_base&lt;2, std::_Placeholder&lt;2&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='82' column='1' id='type-id-601'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-689'/>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EEC2ERKS1_'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-691'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <parameter type-id='type-id-591'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-603'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <parameter type-id='type-id-1664'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1677'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='98' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Placeholder&lt;2&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1665' is-artificial='yes'/>
-            <parameter type-id='type-id-1724'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1678' is-artificial='yes'/>
+            <parameter type-id='type-id-1737'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2ESt12_PlaceholderILi2EELb1EE7_M_headERS2_'>
-            <parameter type-id='type-id-1663'/>
-            <return type-id='type-id-1723'/>
+            <parameter type-id='type-id-1676'/>
+            <return type-id='type-id-1736'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;, false&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-592'>
+      <class-decl name='_Head_base&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;, false&gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-604'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-358' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-371' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ERKS4_'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2ERKS5_'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-594'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-1667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1680'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2IS4_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EEC2IS4_EEOT_'>
-            <parameter type-id='type-id-1668' is-artificial='yes'/>
-            <parameter type-id='type-id-1448'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1681' is-artificial='yes'/>
+            <parameter type-id='type-id-1461'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEELb0EE7_M_headERS5_'>
-            <parameter type-id='type-id-1666'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1679'/>
+            <return type-id='type-id-1460'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;3, mongo::executor::TaskExecutor::CallbackHandle, false&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-595'>
+      <class-decl name='_Head_base&lt;3, mongo::executor::TaskExecutor::CallbackHandle, false&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-607'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-398' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-411' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ERKS4_'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-609'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-1670'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-1683'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-1472'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-1485'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IRS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2IRS3_EEOT_'>
-            <parameter type-id='type-id-1671' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1684' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm3EN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-1669'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1682'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-598'>
+      <class-decl name='_Head_base&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-610'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2087' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2100' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-600'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-612'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-1673'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-1686'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' mangled-name='_ZNSt10_Head_baseILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0EEC2IS7_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0EEC2IS7_EEOT_'>
-            <parameter type-id='type-id-1674' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1687' is-artificial='yes'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0EE7_M_headERS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EELb0EE7_M_headERS8_'>
-            <parameter type-id='type-id-1672'/>
-            <return type-id='type-id-2090'/>
+            <parameter type-id='type-id-1685'/>
+            <return type-id='type-id-2103'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;4, unsigned long, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-601'>
+      <class-decl name='_Head_base&lt;4, unsigned long, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-613'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-91' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-96' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-1335'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-1347'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-603'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-615'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-1676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-1689'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;unsigned long&gt;' mangled-name='_ZNSt10_Head_baseILm4EmLb0EEC2ImEEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm4EmLb0EEC2ImEEOT_'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-2449'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-2468'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;unsigned long &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm4EmLb0EEC2IRmEEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm4EmLb0EEC2IRmEEOT_'>
-            <parameter type-id='type-id-1677' is-artificial='yes'/>
-            <parameter type-id='type-id-2448'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1690' is-artificial='yes'/>
+            <parameter type-id='type-id-2467'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm4EmLb0EE7_M_headERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm4EmLb0EE7_M_headERS0_'>
-            <parameter type-id='type-id-1675'/>
-            <return type-id='type-id-2448'/>
+            <parameter type-id='type-id-1688'/>
+            <return type-id='type-id-2467'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;5, nullptr_t, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-604'>
+      <class-decl name='_Head_base&lt;5, nullptr_t, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-616'>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-606'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <parameter type-id='type-id-618'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-1679'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <parameter type-id='type-id-1692'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;nullptr_t&gt;' mangled-name='_ZNSt10_Head_baseILm5EDnLb0EEC2IDnEEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5EDnLb0EEC2IDnEEOT_'>
-            <parameter type-id='type-id-1680' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1693' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm5EDnLb0EE7_M_headERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5EDnLb0EE7_M_headERS0_'>
-            <parameter type-id='type-id-1678'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1691'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-607'>
+      <class-decl name='_Head_base&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, false&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-619'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1145' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1157' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS8_'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2ERKS9_'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-609'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-621'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-1682'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-1695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2IS8_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EEC2IS8_EEOT_'>
-            <parameter type-id='type-id-1683' is-artificial='yes'/>
-            <parameter type-id='type-id-2074'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1696' is-artificial='yes'/>
+            <parameter type-id='type-id-2087'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EE7_M_headERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEELb0EE7_M_headERS9_'>
-            <parameter type-id='type-id-1681'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1694'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;5, std::mutex *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-610'>
+      <class-decl name='_Head_base&lt;5, std::mutex *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-622'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-2101' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-2114' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <parameter type-id='type-id-612'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-624'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <parameter type-id='type-id-1685'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-1698'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::mutex *&gt;' mangled-name='_ZNSt10_Head_baseILm5EPSt5mutexLb0EEC2IS1_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5EPSt5mutexLb0EEC2IS1_EEOT_'>
-            <parameter type-id='type-id-1686' is-artificial='yes'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1699' is-artificial='yes'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm5EPSt5mutexLb0EE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm5EPSt5mutexLb0EE7_M_headERS2_'>
-            <parameter type-id='type-id-1684'/>
-            <return type-id='type-id-2104'/>
+            <parameter type-id='type-id-1697'/>
+            <return type-id='type-id-2117'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Index_tuple&lt;0, 1, 2, 3, 4, 5&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2739'/>
-      <class-decl name='_Index_tuple&lt;0, 1, 2, 3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2745'/>
-      <class-decl name='_Index_tuple&lt;0, 1, 2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2743'/>
-      <class-decl name='_Index_tuple&lt;0, 1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2734'/>
-      <class-decl name='_Index_tuple&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2737'/>
-      <class-decl name='_Index_tuple&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2935'/>
-      <class-decl name='_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='204' column='1' id='type-id-625'>
+      <class-decl name='_Index_tuple&lt;0, 1, 2, 3, 4, 5&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2761'/>
+      <class-decl name='_Index_tuple&lt;0, 1, 2, 3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2767'/>
+      <class-decl name='_Index_tuple&lt;0, 1, 2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2765'/>
+      <class-decl name='_Index_tuple&lt;0, 1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2756'/>
+      <class-decl name='_Index_tuple&lt;0&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2759'/>
+      <class-decl name='_Index_tuple&lt;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='206' column='1' id='type-id-2960'/>
+      <class-decl name='_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='204' column='1' id='type-id-637'>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-629'/>
+          <typedef-decl name='_Self' type-id='type-id-637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-641'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-2939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='211' column='1' id='type-id-2938'/>
+          <typedef-decl name='iterator_category' type-id='type-id-2964' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='211' column='1' id='type-id-2963'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2940'/>
+          <typedef-decl name='pointer' type-id='type-id-418' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2965'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-404' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2941'/>
+          <typedef-decl name='reference' type-id='type-id-417' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2966'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-988' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='280' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1000' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='280' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2EPKNSt8__detail15_List_node_baseE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2EPKNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <parameter type-id='type-id-988'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <parameter type-id='type-id-1000'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2ERKSt14_List_iteratorIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2ERKSt14_List_iteratorIS3_E'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <parameter type-id='type-id-634'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <parameter type-id='type-id-646'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_const_cast' mangled-name='_ZNKSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEE13_M_const_castEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEE13_M_const_castEv'>
-            <parameter type-id='type-id-628' is-artificial='yes'/>
-            <return type-id='type-id-632'/>
+            <parameter type-id='type-id-640' is-artificial='yes'/>
+            <return type-id='type-id-644'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEneERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEneERKS4_'>
-            <parameter type-id='type-id-628' is-artificial='yes'/>
-            <parameter type-id='type-id-631'/>
+            <parameter type-id='type-id-640' is-artificial='yes'/>
+            <parameter type-id='type-id-643'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEppEv'>
-            <parameter type-id='type-id-1699' is-artificial='yes'/>
-            <return type-id='type-id-1700'/>
+            <parameter type-id='type-id-1712' is-artificial='yes'/>
+            <return type-id='type-id-1713'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='204' column='1' id='type-id-635'>
+      <class-decl name='_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='204' column='1' id='type-id-647'>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-635' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-639'/>
+          <typedef-decl name='_Self' type-id='type-id-647' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='206' column='1' id='type-id-651'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-448' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2942'/>
+          <typedef-decl name='pointer' type-id='type-id-460' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='213' column='1' id='type-id-2967'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-447' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2943'/>
+          <typedef-decl name='reference' type-id='type-id-459' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='214' column='1' id='type-id-2968'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-988' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='280' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1000' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='280' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2EPKNSt8__detail15_List_node_baseE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2EPKNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <parameter type-id='type-id-988'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <parameter type-id='type-id-1000'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_const_iterator' mangled-name='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2ERKSt14_List_iteratorIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2ERKSt14_List_iteratorIS3_E'>
-            <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <parameter type-id='type-id-656'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEneERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEneERKS4_'>
-            <parameter type-id='type-id-638' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
+            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_const_cast' mangled-name='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEE13_M_const_castEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEE13_M_const_castEv'>
-            <parameter type-id='type-id-638' is-artificial='yes'/>
-            <return type-id='type-id-642'/>
+            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <return type-id='type-id-654'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEeqERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEeqERKS4_'>
-            <parameter type-id='type-id-638' is-artificial='yes'/>
-            <parameter type-id='type-id-641'/>
+            <parameter type-id='type-id-650' is-artificial='yes'/>
+            <parameter type-id='type-id-653'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEppEv'>
-            <parameter type-id='type-id-1701' is-artificial='yes'/>
-            <return type-id='type-id-1702'/>
+            <parameter type-id='type-id-1714' is-artificial='yes'/>
+            <return type-id='type-id-1715'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='125' column='1' id='type-id-645'>
+      <class-decl name='_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='125' column='1' id='type-id-657'>
         <member-type access='public'>
-          <typedef-decl name='_Node' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2082'/>
+          <typedef-decl name='_Node' type-id='type-id-669' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2095'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-645' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-648'/>
+          <typedef-decl name='_Self' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-660'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-1966' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='195' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1979' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='195' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1704' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1717' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2EPNSt8__detail15_List_node_baseE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEC2EPNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-1704' is-artificial='yes'/>
-            <parameter type-id='type-id-1966'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1717' is-artificial='yes'/>
+            <parameter type-id='type-id-1979'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEneERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEneERKS4_'>
-            <parameter type-id='type-id-647' is-artificial='yes'/>
-            <parameter type-id='type-id-650'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-662'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEdeEv'>
-            <parameter type-id='type-id-647' is-artificial='yes'/>
-            <return type-id='type-id-2674'/>
+            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <return type-id='type-id-2696'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEppEv'>
-            <parameter type-id='type-id-1704' is-artificial='yes'/>
-            <return type-id='type-id-1705'/>
+            <parameter type-id='type-id-1717' is-artificial='yes'/>
+            <return type-id='type-id-1718'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEmmEv'>
-            <parameter type-id='type-id-1704' is-artificial='yes'/>
-            <return type-id='type-id-1705'/>
+            <parameter type-id='type-id-1717' is-artificial='yes'/>
+            <return type-id='type-id-1718'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='125' column='1' id='type-id-651'>
+      <class-decl name='_List_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='125' column='1' id='type-id-663'>
         <member-type access='public'>
-          <typedef-decl name='_Node' type-id='type-id-661' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2092'/>
+          <typedef-decl name='_Node' type-id='type-id-673' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='128' column='1' id='type-id-2105'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-651' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-654'/>
+          <typedef-decl name='_Self' type-id='type-id-663' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='127' column='1' id='type-id-666'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-1966' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='195' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-1979' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='195' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1706' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1719' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_List_iterator' mangled-name='_ZNSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2EPNSt8__detail15_List_node_baseE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEC2EPNSt8__detail15_List_node_baseE'>
-            <parameter type-id='type-id-1706' is-artificial='yes'/>
-            <parameter type-id='type-id-1966'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1719' is-artificial='yes'/>
+            <parameter type-id='type-id-1979'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator!=' mangled-name='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEneERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEneERKS4_'>
-            <parameter type-id='type-id-653' is-artificial='yes'/>
-            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <parameter type-id='type-id-668'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEdeEv'>
-            <parameter type-id='type-id-653' is-artificial='yes'/>
-            <return type-id='type-id-2687'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <return type-id='type-id-2709'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEppEv'>
-            <parameter type-id='type-id-1706' is-artificial='yes'/>
-            <return type-id='type-id-1707'/>
+            <parameter type-id='type-id-1719' is-artificial='yes'/>
+            <return type-id='type-id-1720'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEptEv'>
-            <parameter type-id='type-id-653' is-artificial='yes'/>
-            <return type-id='type-id-2686'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <return type-id='type-id-2708'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEeqERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14_List_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEeqERKS4_'>
-            <parameter type-id='type-id-653' is-artificial='yes'/>
-            <parameter type-id='type-id-656'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <parameter type-id='type-id-668'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-657'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-986'/>
+      <class-decl name='_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-669'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-998'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-402' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-415' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_List_node&lt;&gt;' mangled-name='_ZNSt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEC2IJEEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_nodeIN5mongo8executor12TaskExecutor11EventHandleEEC2IJEEEDpOT_'>
-            <parameter type-id='type-id-1709' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1722' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-661'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-986'/>
+      <class-decl name='_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='106' column='1' id='type-id-673'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-998'/>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='_M_data' type-id='type-id-445' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
+          <var-decl name='_M_data' type-id='type-id-457' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='109' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZNSt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEC2IJS3_EEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEC2IJS3_EEEDpOT_'>
-            <parameter type-id='type-id-1711' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1724' is-artificial='yes'/>
+            <parameter type-id='type-id-1521'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2944'/>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2945'/>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2946'/>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2947'/>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2948'/>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2949'/>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::OperationContext *, mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2799'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2950'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2969'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2970'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2971'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2972'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2973'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-2974'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::OperationContext *, mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2821'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2975'/>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2845'/>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::repl::TaskRunner::NextAction, mongo::OperationContext *, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='504' column='1' id='type-id-2847'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2951'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2870'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;mongo::repl::TaskRunner::NextAction, mongo::OperationContext *, const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='504' column='1' id='type-id-2872'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2976'/>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2851'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2952'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2876'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2977'/>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2853'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2953'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2878'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2978'/>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2858'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2954'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='499' column='1' id='type-id-2883'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2979'/>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2800'/>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2801'/>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2849'/>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2955'>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2823'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2825'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='495' column='1' id='type-id-2874'/>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2980'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIZN5mongo4repl19ReplicationExecutor7startupEvE3$_0E9__do_wrapEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2956'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2981'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEE9__do_wrapES6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEE9__do_wrapES6_'>
-            <return type-id='type-id-2194'/>
+            <parameter type-id='type-id-48'/>
+            <return type-id='type-id-2209'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2957'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2982'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEE9__do_wrapERKSU_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEE9__do_wrapERKSU_'>
-            <parameter type-id='type-id-476'/>
-            <return type-id='type-id-476'/>
+            <parameter type-id='type-id-488'/>
+            <return type-id='type-id-488'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2958'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2983'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEE9__do_wrapERKSU_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerISt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEE9__do_wrapERKSU_'>
-            <parameter type-id='type-id-479'/>
-            <return type-id='type-id-479'/>
+            <parameter type-id='type-id-491'/>
+            <return type-id='type-id-491'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2959'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2984'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerISt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEE9__do_wrapERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerISt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEE9__do_wrapERKS8_'>
-            <parameter type-id='type-id-1143'/>
-            <return type-id='type-id-1143'/>
+            <parameter type-id='type-id-1155'/>
+            <return type-id='type-id-1155'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2960'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2985'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEE9__do_wrapEOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEE9__do_wrapEOSI_'>
-            <parameter type-id='type-id-2455'/>
-            <return type-id='type-id-2455'/>
+            <parameter type-id='type-id-2474'/>
+            <return type-id='type-id-2474'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2961'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2986'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEE9__do_wrapEOSN_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEE9__do_wrapEOSN_'>
-            <parameter type-id='type-id-2461'/>
-            <return type-id='type-id-2461'/>
+            <parameter type-id='type-id-2480'/>
+            <return type-id='type-id-2480'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2962'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-2987'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKSt8functionIFvvEEEE9__do_wrapEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKSt8functionIFvvEEEE9__do_wrapEOS6_'>
-            <parameter type-id='type-id-2478'/>
-            <return type-id='type-id-2478'/>
+            <parameter type-id='type-id-2497'/>
+            <return type-id='type-id-2497'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2963'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2988'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEE9__do_wrapESP_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEE9__do_wrapESP_'>
-            <return type-id='type-id-2196'/>
+            <parameter type-id='type-id-119'/>
+            <return type-id='type-id-2211'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2964'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-2989'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEE9__do_wrapESL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEE9__do_wrapESL_'>
-            <return type-id='type-id-2198'/>
+            <parameter type-id='type-id-121'/>
+            <return type-id='type-id-2213'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Placeholder&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='957' column='1' id='type-id-674'/>
-      <class-decl name='_Placeholder&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='957' column='1' id='type-id-677'/>
-      <class-decl name='_Sp_ebo_helper&lt;0, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='408' column='1' id='type-id-1737'>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1046'/>
+      <class-decl name='_Placeholder&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='957' column='1' id='type-id-686'/>
+      <class-decl name='_Placeholder&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='957' column='1' id='type-id-689'/>
+      <class-decl name='_Sp_ebo_helper&lt;0, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='408' column='1' id='type-id-1750'>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1058'/>
         <member-function access='public'>
           <function-decl name='_Sp_ebo_helper' mangled-name='_ZNSt14_Sp_ebo_helperILi0ESaIN5mongo4repl19ReplicationExecutor5EventEELb1EEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Sp_ebo_helperILi0ESaIN5mongo4repl19ReplicationExecutor5EventEELb1EEC2ERKS4_'>
-            <parameter type-id='type-id-1739' is-artificial='yes'/>
-            <parameter type-id='type-id-1048'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1752' is-artificial='yes'/>
+            <parameter type-id='type-id-1060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_get' mangled-name='_ZNSt14_Sp_ebo_helperILi0ESaIN5mongo4repl19ReplicationExecutor5EventEELb1EE6_S_getERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14_Sp_ebo_helperILi0ESaIN5mongo4repl19ReplicationExecutor5EventEELb1EE6_S_getERS5_'>
-            <parameter type-id='type-id-1738'/>
-            <return type-id='type-id-2010'/>
+            <parameter type-id='type-id-1751'/>
+            <return type-id='type-id-2023'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_ebo_helper&lt;0, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='408' column='1' id='type-id-1740'>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1071'/>
+      <class-decl name='_Sp_ebo_helper&lt;0, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='408' column='1' id='type-id-1753'>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1083'/>
         <member-function access='public'>
           <function-decl name='_Sp_ebo_helper' mangled-name='_ZNSt14_Sp_ebo_helperILi0ESaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEELb1EEC2ERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1742' is-artificial='yes'/>
-            <parameter type-id='type-id-1073'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1755' is-artificial='yes'/>
+            <parameter type-id='type-id-1085'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_get' mangled-name='_ZNSt14_Sp_ebo_helperILi0ESaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEELb1EE6_S_getERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1741'/>
-            <return type-id='type-id-2022'/>
+            <parameter type-id='type-id-1754'/>
+            <return type-id='type-id-2035'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Sp_make_shared_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='491' column='1' id='type-id-2829'/>
-      <class-decl name='_Tuple_impl&lt;0, (lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-695'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-511'/>
+      <class-decl name='_Sp_make_shared_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='491' column='1' id='type-id-2854'/>
+      <class-decl name='_Tuple_impl&lt;0, (lambda at src/mongo/db/repl/replication_executor.cpp:125:36)&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-707'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-523'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1852' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-698'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-710'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1745' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1758' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1745' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1758' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1745' is-artificial='yes'/>
-            <parameter type-id='type-id-697'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1758' is-artificial='yes'/>
+            <parameter type-id='type-id-709'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1745' is-artificial='yes'/>
-            <parameter type-id='type-id-1744'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1758' is-artificial='yes'/>
+            <parameter type-id='type-id-1757'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36), void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1745' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1758' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1743'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1756'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJZN5mongo4repl19ReplicationExecutor7startupEvE3$_0EE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1743'/>
-            <return type-id='type-id-1746'/>
+            <parameter type-id='type-id-1756'/>
+            <return type-id='type-id-1759'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-701'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-514'/>
+      <class-decl name='_Tuple_impl&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-713'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-526'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1762' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ES6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ES6_'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1762' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-703'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1762' is-artificial='yes'/>
+            <parameter type-id='type-id-715'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1749' is-artificial='yes'/>
-            <parameter type-id='type-id-1748'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1762' is-artificial='yes'/>
+            <parameter type-id='type-id-1761'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS7_'>
-            <parameter type-id='type-id-1747'/>
-            <return type-id='type-id-360'/>
+            <parameter type-id='type-id-1760'/>
+            <return type-id='type-id-373'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-704'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-517'/>
+      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-716'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-529'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-706'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-1751'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-1764'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS6_'>
-            <parameter type-id='type-id-1750'/>
-            <return type-id='type-id-394'/>
+            <parameter type-id='type-id-1763'/>
+            <return type-id='type-id-407'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-706'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-718'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1752' is-artificial='yes'/>
-            <parameter type-id='type-id-1751'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1765' is-artificial='yes'/>
+            <parameter type-id='type-id-1764'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-707'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-788'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-520'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-719'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-800'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-532'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-710'/>
+          <typedef-decl name='_Inherited' type-id='type-id-800' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-722'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1755' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1768' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEEC2ES3_S5_'>
-            <parameter type-id='type-id-1755' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1768' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1755' is-artificial='yes'/>
-            <parameter type-id='type-id-709'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1768' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1755' is-artificial='yes'/>
-            <parameter type-id='type-id-1754'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1768' is-artificial='yes'/>
+            <parameter type-id='type-id-1767'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRPN5mongo16OperationContextERNS0_6StatusEEE7_M_headERS6_'>
-            <parameter type-id='type-id-1753'/>
-            <return type-id='type-id-2593'/>
+            <parameter type-id='type-id-1766'/>
+            <return type-id='type-id-2614'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *, mongo::Status&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-713'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-791'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-523'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::OperationContext *, mongo::Status&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-725'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-803'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-535'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-791' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-716'/>
+          <typedef-decl name='_Inherited' type-id='type-id-803' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-728'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1772' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <parameter type-id='type-id-2592'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1772' is-artificial='yes'/>
+            <parameter type-id='type-id-2613'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2ERKS4_'>
-            <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <parameter type-id='type-id-715'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1772' is-artificial='yes'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2EOS4_'>
-            <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <parameter type-id='type-id-1758'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1772' is-artificial='yes'/>
+            <parameter type-id='type-id-1771'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::OperationContext *&amp;, const mongo::Status &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2IRS2_JRKS3_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEEC2IRS2_JRKS3_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1759' is-artificial='yes'/>
-            <parameter type-id='type-id-2593'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1772' is-artificial='yes'/>
+            <parameter type-id='type-id-2614'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEE7_M_headERS4_'>
-            <parameter type-id='type-id-1757'/>
-            <return type-id='type-id-2593'/>
+            <parameter type-id='type-id-1770'/>
+            <return type-id='type-id-2614'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo16OperationContextENS0_6StatusEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-1757'/>
-            <return type-id='type-id-1760'/>
+            <parameter type-id='type-id-1770'/>
+            <return type-id='type-id-1773'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-719'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-526'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-731'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-824'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-538'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-722'/>
+          <typedef-decl name='_Inherited' type-id='type-id-824' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-734'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1763' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1776' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1763' is-artificial='yes'/>
-            <parameter type-id='type-id-2599'/>
-            <parameter type-id='type-id-1107'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1776' is-artificial='yes'/>
+            <parameter type-id='type-id-2620'/>
+            <parameter type-id='type-id-1119'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1763' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1776' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1763' is-artificial='yes'/>
-            <parameter type-id='type-id-1762'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1776' is-artificial='yes'/>
+            <parameter type-id='type-id-1775'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::NetworkInterface *&amp;, std::default_delete&lt;mongo::executor::NetworkInterface&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1763' is-artificial='yes'/>
-            <parameter type-id='type-id-2600'/>
-            <parameter type-id='type-id-2047'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1776' is-artificial='yes'/>
+            <parameter type-id='type-id-2621'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEE7_M_headERKS6_'>
-            <parameter type-id='type-id-721'/>
-            <return type-id='type-id-2599'/>
+            <parameter type-id='type-id-733'/>
+            <return type-id='type-id-2620'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEE7_M_headERS6_'>
-            <parameter type-id='type-id-1761'/>
-            <return type-id='type-id-2600'/>
+            <parameter type-id='type-id-1774'/>
+            <return type-id='type-id-2621'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-725'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-529'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-737'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-541'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1780' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1780' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2ERKS4_'>
-            <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1780' is-artificial='yes'/>
+            <parameter type-id='type-id-739'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2EOS4_'>
-            <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <parameter type-id='type-id-1766'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1780' is-artificial='yes'/>
+            <parameter type-id='type-id-1779'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackArgs, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEEC2IS3_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1767' is-artificial='yes'/>
-            <parameter type-id='type-id-1469'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1780' is-artificial='yes'/>
+            <parameter type-id='type-id-1482'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_headERS4_'>
-            <parameter type-id='type-id-1765'/>
-            <return type-id='type-id-1468'/>
+            <parameter type-id='type-id-1778'/>
+            <return type-id='type-id-1481'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-1765'/>
-            <return type-id='type-id-1746'/>
+            <parameter type-id='type-id-1778'/>
+            <return type-id='type-id-1759'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-728'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-794'/>
-        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-532'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1088' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-740'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
+        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-544'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-794' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-731'/>
+          <typedef-decl name='_Inherited' type-id='type-id-806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-743'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1783' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1783' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2ERKSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2ERKSG_'>
-            <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-730'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1783' is-artificial='yes'/>
+            <parameter type-id='type-id-742'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2EOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2EOSG_'>
-            <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1769'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1783' is-artificial='yes'/>
+            <parameter type-id='type-id-1782'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IS3_JRS5_RKS7_RS9_RmRKSF_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEEC2IS3_JRS5_RKS7_RS9_RmRKSF_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1770' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1783' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_headERSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_headERSG_'>
-            <parameter type-id='type-id-1768'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1781'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_tailERSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEE7_M_tailERSG_'>
-            <parameter type-id='type-id-1768'/>
-            <return type-id='type-id-1771'/>
+            <parameter type-id='type-id-1781'/>
+            <return type-id='type-id-1784'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-734'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-800'/>
-        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-532'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-746'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-812'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-544'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-800' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-737'/>
+          <typedef-decl name='_Inherited' type-id='type-id-812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-749'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1787' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1787' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2ERKSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2ERKSF_'>
-            <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1787' is-artificial='yes'/>
+            <parameter type-id='type-id-748'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2EOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2EOSF_'>
-            <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-1773'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1787' is-artificial='yes'/>
+            <parameter type-id='type-id-1786'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IS3_JRKS5_RKS6_RS9_SE_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEEC2IS3_JRKS5_RKS6_RS9_SE_DnEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1774' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1787' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_headERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_headERSF_'>
-            <parameter type-id='type-id-1772'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1785'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_tailERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEE7_M_tailERSF_'>
-            <parameter type-id='type-id-1772'/>
-            <return type-id='type-id-1775'/>
+            <parameter type-id='type-id-1785'/>
+            <return type-id='type-id-1788'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-740'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-806'/>
-        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-532'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-752'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-818'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-544'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-743'/>
+          <typedef-decl name='_Inherited' type-id='type-id-818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-755'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1791' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1791' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2ERKSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2ERKSH_'>
-            <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-742'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1791' is-artificial='yes'/>
+            <parameter type-id='type-id-754'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2EOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2EOSH_'>
-            <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1777'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1791' is-artificial='yes'/>
+            <parameter type-id='type-id-1790'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IS3_JRKS5_RKS6_RS9_SE_SG_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEEC2IS3_JRKS5_RKS6_RS9_SE_SG_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1778' is-artificial='yes'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1791' is-artificial='yes'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_headERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_headERSH_'>
-            <parameter type-id='type-id-1776'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-1789'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_tailERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEE7_M_tailERSH_'>
-            <parameter type-id='type-id-1776'/>
-            <return type-id='type-id-1779'/>
+            <parameter type-id='type-id-1789'/>
+            <return type-id='type-id-1792'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-746'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-818'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-535'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-758'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-830'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-547'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-749'/>
+          <typedef-decl name='_Inherited' type-id='type-id-830' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-761'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1795' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <parameter type-id='type-id-2624'/>
-            <parameter type-id='type-id-1111'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1795' is-artificial='yes'/>
+            <parameter type-id='type-id-2645'/>
+            <parameter type-id='type-id-1123'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <parameter type-id='type-id-748'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1795' is-artificial='yes'/>
+            <parameter type-id='type-id-760'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <parameter type-id='type-id-1781'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1795' is-artificial='yes'/>
+            <parameter type-id='type-id-1794'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::StorageInterface *&amp;, std::default_delete&lt;mongo::repl::StorageInterface&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1782' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <parameter type-id='type-id-2050'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1795' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <parameter type-id='type-id-2063'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEE7_M_headERS6_'>
-            <parameter type-id='type-id-1780'/>
-            <return type-id='type-id-2625'/>
+            <parameter type-id='type-id-1793'/>
+            <return type-id='type-id-2646'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-752'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-535'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::StorageInterface *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-764'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-547'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1786' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1799' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1786' is-artificial='yes'/>
-            <parameter type-id='type-id-2624'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1799' is-artificial='yes'/>
+            <parameter type-id='type-id-2645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1786' is-artificial='yes'/>
-            <parameter type-id='type-id-754'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1799' is-artificial='yes'/>
+            <parameter type-id='type-id-766'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEEC2EOS4_'>
-            <parameter type-id='type-id-1786' is-artificial='yes'/>
-            <parameter type-id='type-id-1785'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1799' is-artificial='yes'/>
+            <parameter type-id='type-id-1798'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::StorageInterface *&amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEEC2IRS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEEC2IRS3_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1786' is-artificial='yes'/>
-            <parameter type-id='type-id-2625'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1799' is-artificial='yes'/>
+            <parameter type-id='type-id-2646'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEE7_M_headERS4_'>
-            <parameter type-id='type-id-1784'/>
-            <return type-id='type-id-2625'/>
+            <parameter type-id='type-id-1797'/>
+            <return type-id='type-id-2646'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl16StorageInterfaceEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-1784'/>
-            <return type-id='type-id-1746'/>
+            <parameter type-id='type-id-1797'/>
+            <return type-id='type-id-1759'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-755'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-827'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-538'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-767'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-839'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-550'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-827' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-758'/>
+          <typedef-decl name='_Inherited' type-id='type-id-839' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-770'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1789' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1802' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKS1_RKSA_RKSB_RKSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKS1_RKSA_RKSB_RKSE_'>
-            <parameter type-id='type-id-1789' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1802' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2ERKSF_'>
-            <parameter type-id='type-id-1789' is-artificial='yes'/>
-            <parameter type-id='type-id-757'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1802' is-artificial='yes'/>
+            <parameter type-id='type-id-769'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2EOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEEC2EOSF_'>
-            <parameter type-id='type-id-1789' is-artificial='yes'/>
-            <parameter type-id='type-id-1788'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1802' is-artificial='yes'/>
+            <parameter type-id='type-id-1801'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEE7_M_headERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEE7_M_headERSF_'>
-            <parameter type-id='type-id-1787'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1800'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEE7_M_tailERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEE7_M_tailERSF_'>
-            <parameter type-id='type-id-1787'/>
-            <return type-id='type-id-1790'/>
+            <parameter type-id='type-id-1800'/>
+            <return type-id='type-id-1803'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-761'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-833'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-538'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-773'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-845'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-550'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-833' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-764'/>
+          <typedef-decl name='_Inherited' type-id='type-id-845' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-776'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1793' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1806' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1793' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1806' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2ERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2ERKSC_'>
-            <parameter type-id='type-id-1793' is-artificial='yes'/>
-            <parameter type-id='type-id-763'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1806' is-artificial='yes'/>
+            <parameter type-id='type-id-775'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2EOSC_'>
-            <parameter type-id='type-id-1793' is-artificial='yes'/>
-            <parameter type-id='type-id-1792'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1806' is-artificial='yes'/>
+            <parameter type-id='type-id-1805'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2IRKS1_JRKSA_RSB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEEC2IRKS1_JRKSA_RSB_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1793' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1806' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEE7_M_headERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEE7_M_headERSC_'>
-            <parameter type-id='type-id-1791'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1804'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEE7_M_tailERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEE7_M_tailERSC_'>
-            <parameter type-id='type-id-1791'/>
-            <return type-id='type-id-1794'/>
+            <parameter type-id='type-id-1804'/>
+            <return type-id='type-id-1807'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-767'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-821'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-541'/>
+      <class-decl name='_Tuple_impl&lt;0, std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-779'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-833'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-553'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-821' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-770'/>
+          <typedef-decl name='_Inherited' type-id='type-id-833' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-782'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1797' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1797' is-artificial='yes'/>
-            <parameter type-id='type-id-2636'/>
-            <parameter type-id='type-id-1115'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
+            <parameter type-id='type-id-2658'/>
+            <parameter type-id='type-id-1127'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1797' is-artificial='yes'/>
-            <parameter type-id='type-id-769'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
+            <parameter type-id='type-id-781'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1797' is-artificial='yes'/>
-            <parameter type-id='type-id-1796'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1810' is-artificial='yes'/>
+            <parameter type-id='type-id-1809'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEE7_M_headERKS8_'>
-            <parameter type-id='type-id-769'/>
-            <return type-id='type-id-2636'/>
+            <parameter type-id='type-id-781'/>
+            <return type-id='type-id-2658'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::function&lt;void ()&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-773'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-544'/>
+      <class-decl name='_Tuple_impl&lt;0, std::function&lt;void ()&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-785'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-556'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1801' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1814' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2ERKS2_'>
-            <parameter type-id='type-id-1801' is-artificial='yes'/>
-            <parameter type-id='type-id-1135'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1814' is-artificial='yes'/>
+            <parameter type-id='type-id-1147'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2ERKS3_'>
-            <parameter type-id='type-id-1801' is-artificial='yes'/>
-            <parameter type-id='type-id-775'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1814' is-artificial='yes'/>
+            <parameter type-id='type-id-787'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEEC2EOS3_'>
-            <parameter type-id='type-id-1801' is-artificial='yes'/>
-            <parameter type-id='type-id-1800'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1814' is-artificial='yes'/>
+            <parameter type-id='type-id-1813'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEE7_M_headERS3_'>
-            <parameter type-id='type-id-1799'/>
-            <return type-id='type-id-2064'/>
+            <parameter type-id='type-id-1812'/>
+            <return type-id='type-id-2077'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEE7_M_tailERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt8functionIFvvEEEE7_M_tailERS3_'>
-            <parameter type-id='type-id-1799'/>
-            <return type-id='type-id-1746'/>
+            <parameter type-id='type-id-1812'/>
+            <return type-id='type-id-1759'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-776'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-824'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-547'/>
+      <class-decl name='_Tuple_impl&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-788'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-836'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-559'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-824' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-779'/>
+          <typedef-decl name='_Inherited' type-id='type-id-836' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-791'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1804' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1804' is-artificial='yes'/>
-            <parameter type-id='type-id-2098'/>
-            <parameter type-id='type-id-1119'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <parameter type-id='type-id-2111'/>
+            <parameter type-id='type-id-1131'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1804' is-artificial='yes'/>
-            <parameter type-id='type-id-778'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <parameter type-id='type-id-790'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1804' is-artificial='yes'/>
-            <parameter type-id='type-id-1803'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <parameter type-id='type-id-1816'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::lock_guard&lt;std::mutex&gt; *&amp;, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEEC2IRS3_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1804' is-artificial='yes'/>
-            <parameter type-id='type-id-2099'/>
-            <parameter type-id='type-id-2055'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1817' is-artificial='yes'/>
+            <parameter type-id='type-id-2112'/>
+            <parameter type-id='type-id-2068'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEE7_M_headERS6_'>
-            <parameter type-id='type-id-1802'/>
-            <return type-id='type-id-2099'/>
+            <parameter type-id='type-id-1815'/>
+            <return type-id='type-id-2112'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-782'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-839'/>
-        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-550'/>
+      <class-decl name='_Tuple_impl&lt;0, unsigned int, unsigned int&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-794'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-851'/>
+        <base-class access='private' layout-offset-in-bits='32' type-id='type-id-562'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-839' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-785'/>
+          <typedef-decl name='_Inherited' type-id='type-id-851' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-797'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1808' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1808' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1808' is-artificial='yes'/>
-            <parameter type-id='type-id-784'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
+            <parameter type-id='type-id-796'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1808' is-artificial='yes'/>
-            <parameter type-id='type-id-1807'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1821' is-artificial='yes'/>
+            <parameter type-id='type-id-1820'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::Status &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-788'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-553'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::Status &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-800'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-565'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1812' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEEC2ES2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEEC2ES2_'>
-            <parameter type-id='type-id-1812' is-artificial='yes'/>
-            <parameter type-id='type-id-1442'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <parameter type-id='type-id-1455'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1812' is-artificial='yes'/>
-            <parameter type-id='type-id-790'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <parameter type-id='type-id-802'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1812' is-artificial='yes'/>
-            <parameter type-id='type-id-1811'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1825' is-artificial='yes'/>
+            <parameter type-id='type-id-1824'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJRN5mongo6StatusEEE7_M_headERS3_'>
-            <parameter type-id='type-id-1810'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1823'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::Status&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-791'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-556'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::Status&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-803'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-568'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1815' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1828' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2ERKS1_'>
-            <parameter type-id='type-id-1815' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1828' is-artificial='yes'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2ERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2ERKS2_'>
-            <parameter type-id='type-id-1815' is-artificial='yes'/>
-            <parameter type-id='type-id-793'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1828' is-artificial='yes'/>
+            <parameter type-id='type-id-805'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEEC2EOS2_'>
-            <parameter type-id='type-id-1815' is-artificial='yes'/>
-            <parameter type-id='type-id-1814'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1828' is-artificial='yes'/>
+            <parameter type-id='type-id-1827'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_headERS2_'>
-            <parameter type-id='type-id-1813'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1826'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_tailERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo6StatusEEE7_M_tailERS2_'>
-            <parameter type-id='type-id-1813'/>
-            <return type-id='type-id-1831'/>
+            <parameter type-id='type-id-1826'/>
+            <return type-id='type-id-1844'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-794'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-854'/>
-        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-559'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-806'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-866'/>
+        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-571'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-854' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-797'/>
+          <typedef-decl name='_Inherited' type-id='type-id-866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-809'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1831' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1831' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2ERKSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2ERKSD_'>
-            <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <parameter type-id='type-id-796'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1831' is-artificial='yes'/>
+            <parameter type-id='type-id-808'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2EOSD_'>
-            <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <parameter type-id='type-id-1817'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1831' is-artificial='yes'/>
+            <parameter type-id='type-id-1830'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2IRS2_JRKS4_RS6_RmRKSC_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEC2IRS2_JRKS4_RS6_RmRKSC_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1818' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1831' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_headERSD_'>
-            <parameter type-id='type-id-1816'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1829'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_tailERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEE7_M_tailERSD_'>
-            <parameter type-id='type-id-1816'/>
-            <return type-id='type-id-1819'/>
+            <parameter type-id='type-id-1829'/>
+            <return type-id='type-id-1832'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-800'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-562'/>
+      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-812'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-872'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-574'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-803'/>
+          <typedef-decl name='_Inherited' type-id='type-id-872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-815'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1835' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1835' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2ERKSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2ERKSE_'>
-            <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-802'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1835' is-artificial='yes'/>
+            <parameter type-id='type-id-814'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2EOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2EOSE_'>
-            <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-1821'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1835' is-artificial='yes'/>
+            <parameter type-id='type-id-1834'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2IRKS1_JRKS2_RS6_SD_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEC2IRKS1_JRKS2_RS6_SD_DnEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1822' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1835' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEE7_M_headERSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEE7_M_headERSE_'>
-            <parameter type-id='type-id-1820'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1833'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEE7_M_tailERSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEE7_M_tailERSE_'>
-            <parameter type-id='type-id-1820'/>
-            <return type-id='type-id-1823'/>
+            <parameter type-id='type-id-1833'/>
+            <return type-id='type-id-1836'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-806'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-866'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-562'/>
+      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-818'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-878'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-574'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-809'/>
+          <typedef-decl name='_Inherited' type-id='type-id-878' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-821'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1826' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1826' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2ERKSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2ERKSG_'>
-            <parameter type-id='type-id-1826' is-artificial='yes'/>
-            <parameter type-id='type-id-808'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <parameter type-id='type-id-820'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2EOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2EOSG_'>
-            <parameter type-id='type-id-1826' is-artificial='yes'/>
-            <parameter type-id='type-id-1825'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <parameter type-id='type-id-1838'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2IRKS1_JRKS2_RS6_SD_SF_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEC2IRKS1_JRKS2_RS6_SD_SF_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1826' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1839' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEE7_M_headERSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEE7_M_headERSG_'>
-            <parameter type-id='type-id-1824'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1837'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEE7_M_tailERSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEE7_M_tailERSG_'>
-            <parameter type-id='type-id-1824'/>
-            <return type-id='type-id-1827'/>
+            <parameter type-id='type-id-1837'/>
+            <return type-id='type-id-1840'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-812'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-565'/>
+      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-824'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-577'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1875' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-815'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1888' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-827'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1830' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1830' is-artificial='yes'/>
-            <parameter type-id='type-id-1107'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <parameter type-id='type-id-1119'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1830' is-artificial='yes'/>
-            <parameter type-id='type-id-814'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <parameter type-id='type-id-826'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1830' is-artificial='yes'/>
-            <parameter type-id='type-id-1829'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <parameter type-id='type-id-1842'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo8executor16NetworkInterfaceEEEEC2IS4_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo8executor16NetworkInterfaceEEEEC2IS4_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1830' is-artificial='yes'/>
-            <parameter type-id='type-id-2047'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1843' is-artificial='yes'/>
+            <parameter type-id='type-id-2060'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo8executor16NetworkInterfaceEEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo8executor16NetworkInterfaceEEEE7_M_headERS5_'>
-            <parameter type-id='type-id-1828'/>
-            <return type-id='type-id-2046'/>
+            <parameter type-id='type-id-1841'/>
+            <return type-id='type-id-2059'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-818'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-568'/>
+      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-830'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-580'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1847' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-1111'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1847' is-artificial='yes'/>
+            <parameter type-id='type-id-1123'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-820'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1847' is-artificial='yes'/>
+            <parameter type-id='type-id-832'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-1833'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1847' is-artificial='yes'/>
+            <parameter type-id='type-id-1846'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo4repl16StorageInterfaceEEEEC2IS4_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo4repl16StorageInterfaceEEEEC2IS4_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1834' is-artificial='yes'/>
-            <parameter type-id='type-id-2050'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1847' is-artificial='yes'/>
+            <parameter type-id='type-id-2063'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo4repl16StorageInterfaceEEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteIN5mongo4repl16StorageInterfaceEEEE7_M_headERS5_'>
-            <parameter type-id='type-id-1832'/>
-            <return type-id='type-id-2049'/>
+            <parameter type-id='type-id-1845'/>
+            <return type-id='type-id-2062'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-821'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-571'/>
+      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-833'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-583'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1850' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <parameter type-id='type-id-1115'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1850' is-artificial='yes'/>
+            <parameter type-id='type-id-1127'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <parameter type-id='type-id-823'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1850' is-artificial='yes'/>
+            <parameter type-id='type-id-835'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1837' is-artificial='yes'/>
-            <parameter type-id='type-id-1836'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1850' is-artificial='yes'/>
+            <parameter type-id='type-id-1849'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-824'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-574'/>
+      <class-decl name='_Tuple_impl&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-836'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-586'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1840' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1853' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1840' is-artificial='yes'/>
-            <parameter type-id='type-id-1119'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1853' is-artificial='yes'/>
+            <parameter type-id='type-id-1131'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1840' is-artificial='yes'/>
-            <parameter type-id='type-id-826'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1853' is-artificial='yes'/>
+            <parameter type-id='type-id-838'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1840' is-artificial='yes'/>
-            <parameter type-id='type-id-1839'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1853' is-artificial='yes'/>
+            <parameter type-id='type-id-1852'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteISt10lock_guardISt5mutexEEEEC2IS4_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteISt10lock_guardISt5mutexEEEEC2IS4_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1840' is-artificial='yes'/>
-            <parameter type-id='type-id-2055'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1853' is-artificial='yes'/>
+            <parameter type-id='type-id-2068'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt14default_deleteISt10lock_guardISt5mutexEEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt14default_deleteISt10lock_guardISt5mutexEEEE7_M_headERS5_'>
-            <parameter type-id='type-id-1838'/>
-            <return type-id='type-id-2054'/>
+            <parameter type-id='type-id-1851'/>
+            <return type-id='type-id-2067'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-827'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-842'/>
-        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-577'/>
+      <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1280' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-839'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-854'/>
+        <base-class access='private' layout-offset-in-bits='1024' type-id='type-id-589'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-842' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-830'/>
+          <typedef-decl name='_Inherited' type-id='type-id-854' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-842'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1856' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2ERKS8_RKS9_RKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2ERKS8_RKS9_RKSC_'>
-            <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1856' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2ERKSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2ERKSD_'>
-            <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-829'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1856' is-artificial='yes'/>
+            <parameter type-id='type-id-841'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEC2EOSD_'>
-            <parameter type-id='type-id-1843' is-artificial='yes'/>
-            <parameter type-id='type-id-1842'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1856' is-artificial='yes'/>
+            <parameter type-id='type-id-1855'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEE7_M_headERSD_'>
-            <parameter type-id='type-id-1841'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1854'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEE7_M_tailERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEE7_M_tailERSD_'>
-            <parameter type-id='type-id-1841'/>
-            <return type-id='type-id-1844'/>
+            <parameter type-id='type-id-1854'/>
+            <return type-id='type-id-1857'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-833'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-848'/>
-        <base-class access='private' layout-offset-in-bits='576' type-id='type-id-577'/>
+      <class-decl name='_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='832' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-845'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-860'/>
+        <base-class access='private' layout-offset-in-bits='576' type-id='type-id-589'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-848' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-836'/>
+          <typedef-decl name='_Inherited' type-id='type-id-860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-848'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1860' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1860' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2ERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2ERKSA_'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-835'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1860' is-artificial='yes'/>
+            <parameter type-id='type-id-847'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2EOSA_'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-1846'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1860' is-artificial='yes'/>
+            <parameter type-id='type-id-1859'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2IRKS8_JRS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEEC2IRKS8_JRS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1847' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1860' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEE7_M_headERSA_'>
-            <parameter type-id='type-id-1845'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1858'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS2_20RemoteCommandRequestEEE7_M_tailERSA_'>
-            <parameter type-id='type-id-1845'/>
-            <return type-id='type-id-1848'/>
+            <parameter type-id='type-id-1858'/>
+            <return type-id='type-id-1861'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-839'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-580'/>
+      <class-decl name='_Tuple_impl&lt;1, unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-851'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-592'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1864' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-1333'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1864' is-artificial='yes'/>
+            <parameter type-id='type-id-1345'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-841'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1864' is-artificial='yes'/>
+            <parameter type-id='type-id-853'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1851' is-artificial='yes'/>
-            <parameter type-id='type-id-1850'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1864' is-artificial='yes'/>
+            <parameter type-id='type-id-1863'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1852'>
+      <class-decl name='_Tuple_impl&lt;1&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1865'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1867' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1854' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1867' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-842'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-872'/>
-        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-583'/>
+      <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='1024' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-854'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-884'/>
+        <base-class access='private' layout-offset-in-bits='448' type-id='type-id-595'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-845'/>
+          <typedef-decl name='_Inherited' type-id='type-id-884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-857'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1870' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2ERKS2_RKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2ERKS2_RKS5_'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1870' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2ERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2ERKS6_'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <parameter type-id='type-id-844'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1870' is-artificial='yes'/>
+            <parameter type-id='type-id-856'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEEC2EOS6_'>
-            <parameter type-id='type-id-1857' is-artificial='yes'/>
-            <parameter type-id='type-id-1856'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1870' is-artificial='yes'/>
+            <parameter type-id='type-id-1869'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_headERS6_'>
-            <parameter type-id='type-id-1855'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1868'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_tailERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS0_10StatusWithINS1_21RemoteCommandResponseEEEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-1855'/>
-            <return type-id='type-id-1858'/>
+            <parameter type-id='type-id-1868'/>
+            <return type-id='type-id-1871'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-848'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1894'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-583'/>
+      <class-decl name='_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-860'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1907'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-595'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1894' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-851'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1907' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-863'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1874' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-386'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1874' is-artificial='yes'/>
+            <parameter type-id='type-id-399'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2ERKS3_'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-850'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1874' is-artificial='yes'/>
+            <parameter type-id='type-id-862'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2EOS3_'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-1860'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1874' is-artificial='yes'/>
+            <parameter type-id='type-id-1873'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::RemoteCommandRequest &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2IRS2_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEC2IRS2_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1861' is-artificial='yes'/>
-            <parameter type-id='type-id-1462'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1874' is-artificial='yes'/>
+            <parameter type-id='type-id-1475'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_headERS3_'>
-            <parameter type-id='type-id-1859'/>
-            <return type-id='type-id-1462'/>
+            <parameter type-id='type-id-1872'/>
+            <return type-id='type-id-1475'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_tailERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEE7_M_tailERS3_'>
-            <parameter type-id='type-id-1859'/>
-            <return type-id='type-id-1862'/>
+            <parameter type-id='type-id-1872'/>
+            <return type-id='type-id-1875'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-854'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-890'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-586'/>
+      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-866'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-902'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-598'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-857'/>
+          <typedef-decl name='_Inherited' type-id='type-id-902' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-869'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1878' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1878' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2ERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2ERKSC_'>
-            <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-856'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1878' is-artificial='yes'/>
+            <parameter type-id='type-id-868'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2EOSC_'>
-            <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-1864'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1878' is-artificial='yes'/>
+            <parameter type-id='type-id-1877'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2IRKS1_JRS5_RmRKSB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEEC2IRKS1_JRS5_RmRKSB_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1865' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1878' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEE7_M_headERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEE7_M_headERSC_'>
-            <parameter type-id='type-id-1863'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-1876'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEE7_M_tailERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEE7_M_tailERSC_'>
-            <parameter type-id='type-id-1863'/>
-            <return type-id='type-id-1866'/>
+            <parameter type-id='type-id-1876'/>
+            <return type-id='type-id-1879'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-860'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-878'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-589'/>
+      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-872'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-890'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-601'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-878' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-863'/>
+          <typedef-decl name='_Inherited' type-id='type-id-890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-875'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1882' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1882' is-artificial='yes'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2ERKSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2ERKSD_'>
-            <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-862'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1882' is-artificial='yes'/>
+            <parameter type-id='type-id-874'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2EOSD_'>
-            <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-1868'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1882' is-artificial='yes'/>
+            <parameter type-id='type-id-1881'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2IRKS1_JRS5_SC_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEEC2IRKS1_JRS5_SC_DnEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1869' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1882' is-artificial='yes'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEE7_M_headERSD_'>
-            <parameter type-id='type-id-1867'/>
-            <return type-id='type-id-1723'/>
+            <parameter type-id='type-id-1880'/>
+            <return type-id='type-id-1736'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEE7_M_tailERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEE7_M_tailERSD_'>
-            <parameter type-id='type-id-1867'/>
-            <return type-id='type-id-1870'/>
+            <parameter type-id='type-id-1880'/>
+            <return type-id='type-id-1883'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-866'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-884'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-589'/>
+      <class-decl name='_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-878'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-896'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-601'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-869'/>
+          <typedef-decl name='_Inherited' type-id='type-id-896' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-881'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2ERKSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2ERKSF_'>
-            <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-868'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <parameter type-id='type-id-880'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2EOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2EOSF_'>
-            <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-1872'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <parameter type-id='type-id-1885'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2IRKS1_JRS5_SC_SE_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEEC2IRKS1_JRS5_SC_SE_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1873' is-artificial='yes'/>
-            <parameter type-id='type-id-679'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1886' is-artificial='yes'/>
+            <parameter type-id='type-id-691'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEE7_M_headERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEE7_M_headERSF_'>
-            <parameter type-id='type-id-1871'/>
-            <return type-id='type-id-1723'/>
+            <parameter type-id='type-id-1884'/>
+            <return type-id='type-id-1736'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEE7_M_tailERSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEE7_M_tailERSF_'>
-            <parameter type-id='type-id-1871'/>
-            <return type-id='type-id-1874'/>
+            <parameter type-id='type-id-1884'/>
+            <return type-id='type-id-1887'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1875'>
+      <class-decl name='_Tuple_impl&lt;2&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1888'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1890' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1877' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1890' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-872'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1909'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-592'/>
+      <class-decl name='_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-884'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1922'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-604'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1909' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-875'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1922' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-887'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ERKS4_'>
-            <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-360'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <parameter type-id='type-id-373'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2ERKS5_'>
-            <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-874'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <parameter type-id='type-id-886'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEEC2EOS5_'>
-            <parameter type-id='type-id-1880' is-artificial='yes'/>
-            <parameter type-id='type-id-1879'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1893' is-artificial='yes'/>
+            <parameter type-id='type-id-1892'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_headERS5_'>
-            <parameter type-id='type-id-1878'/>
-            <return type-id='type-id-1447'/>
+            <parameter type-id='type-id-1891'/>
+            <return type-id='type-id-1460'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_tailERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEE7_M_tailERS5_'>
-            <parameter type-id='type-id-1878'/>
-            <return type-id='type-id-1881'/>
+            <parameter type-id='type-id-1891'/>
+            <return type-id='type-id-1894'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-878'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-896'/>
-        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-595'/>
+      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-890'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-908'/>
+        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-607'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-896' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-881'/>
+          <typedef-decl name='_Inherited' type-id='type-id-908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-893'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2ERKSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2ERKSB_'>
-            <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <parameter type-id='type-id-880'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-892'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2EOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2EOSB_'>
-            <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <parameter type-id='type-id-1883'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1896'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2IRS3_JSA_DnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEEC2IRS3_JSA_DnEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1884' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1897' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_headERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_headERSB_'>
-            <parameter type-id='type-id-1882'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1895'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_tailERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEE7_M_tailERSB_'>
-            <parameter type-id='type-id-1882'/>
-            <return type-id='type-id-1885'/>
+            <parameter type-id='type-id-1895'/>
+            <return type-id='type-id-1898'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-884'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-902'/>
-        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-595'/>
+      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-896'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-914'/>
+        <base-class access='private' layout-offset-in-bits='128' type-id='type-id-607'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-902' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-887'/>
+          <typedef-decl name='_Inherited' type-id='type-id-914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-899'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2ERKSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2ERKSD_'>
-            <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <parameter type-id='type-id-886'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-898'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2EOSD_'>
-            <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <parameter type-id='type-id-1887'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-1900'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2IRS3_JSA_SC_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEEC2IRS3_JSA_SC_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1888' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1901' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_headERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_headERSD_'>
-            <parameter type-id='type-id-1886'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1899'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_tailERSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEE7_M_tailERSD_'>
-            <parameter type-id='type-id-1886'/>
-            <return type-id='type-id-1889'/>
+            <parameter type-id='type-id-1899'/>
+            <return type-id='type-id-1902'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-890'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-908'/>
-        <base-class access='private' layout-offset-in-bits='320' type-id='type-id-595'/>
+      <class-decl name='_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='448' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-902'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-920'/>
+        <base-class access='private' layout-offset-in-bits='320' type-id='type-id-607'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-893'/>
+          <typedef-decl name='_Inherited' type-id='type-id-920' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-905'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2ERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2ERKSA_'>
-            <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <parameter type-id='type-id-892'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <parameter type-id='type-id-904'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2EOSA_'>
-            <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <parameter type-id='type-id-1891'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <parameter type-id='type-id-1904'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2IRS3_JRmRKS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEEC2IRS3_JRmRKS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1892' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1905' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_headERSA_'>
-            <parameter type-id='type-id-1890'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1903'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEE7_M_tailERSA_'>
-            <parameter type-id='type-id-1890'/>
-            <return type-id='type-id-1893'/>
+            <parameter type-id='type-id-1903'/>
+            <return type-id='type-id-1906'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1894'>
+      <class-decl name='_Tuple_impl&lt;3&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1907'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1896' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1909' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1896' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1909' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-896'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-914'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-598'/>
+      <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-908'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-926'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-610'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-899'/>
+          <typedef-decl name='_Inherited' type-id='type-id-926' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-911'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1912' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <parameter type-id='type-id-2089'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1912' is-artificial='yes'/>
+            <parameter type-id='type-id-2102'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <parameter type-id='type-id-898'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1912' is-artificial='yes'/>
+            <parameter type-id='type-id-910'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEEC2EOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEEC2EOS8_'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <parameter type-id='type-id-1898'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1912' is-artificial='yes'/>
+            <parameter type-id='type-id-1911'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEEC2IS7_JDnEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEEC2IS7_JDnEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1899' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1912' is-artificial='yes'/>
+            <parameter type-id='type-id-2104'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEE7_M_headERS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEE7_M_headERS8_'>
-            <parameter type-id='type-id-1897'/>
-            <return type-id='type-id-2090'/>
+            <parameter type-id='type-id-1910'/>
+            <return type-id='type-id-2103'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEE7_M_tailERS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEDnEE7_M_tailERS8_'>
-            <parameter type-id='type-id-1897'/>
-            <return type-id='type-id-1900'/>
+            <parameter type-id='type-id-1910'/>
+            <return type-id='type-id-1913'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-902'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-920'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-598'/>
+      <class-decl name='_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-914'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-932'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-610'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-920' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-905'/>
+          <typedef-decl name='_Inherited' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-917'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1903' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1903' is-artificial='yes'/>
-            <parameter type-id='type-id-2089'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <parameter type-id='type-id-2102'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1903' is-artificial='yes'/>
-            <parameter type-id='type-id-904'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <parameter type-id='type-id-916'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEEC2EOSA_'>
-            <parameter type-id='type-id-1903' is-artificial='yes'/>
-            <parameter type-id='type-id-1902'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <parameter type-id='type-id-1915'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEEC2IS7_JS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEEC2IS7_JS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1903' is-artificial='yes'/>
-            <parameter type-id='type-id-2091'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1916' is-artificial='yes'/>
+            <parameter type-id='type-id-2104'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEE7_M_headERSA_'>
-            <parameter type-id='type-id-1901'/>
-            <return type-id='type-id-2090'/>
+            <parameter type-id='type-id-1914'/>
+            <return type-id='type-id-2103'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEPSt5mutexEE7_M_tailERSA_'>
-            <parameter type-id='type-id-1901'/>
-            <return type-id='type-id-1904'/>
+            <parameter type-id='type-id-1914'/>
+            <return type-id='type-id-1917'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-908'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-917'/>
-        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-601'/>
+      <class-decl name='_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='320' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-920'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-929'/>
+        <base-class access='private' layout-offset-in-bits='256' type-id='type-id-613'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-917' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-911'/>
+          <typedef-decl name='_Inherited' type-id='type-id-929' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-923'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1907' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1907' is-artificial='yes'/>
-            <parameter type-id='type-id-1335'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-1347'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS9_'>
-            <parameter type-id='type-id-1907' is-artificial='yes'/>
-            <parameter type-id='type-id-910'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-922'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2EOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2EOS9_'>
-            <parameter type-id='type-id-1907' is-artificial='yes'/>
-            <parameter type-id='type-id-1906'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-1919'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2IRmJRKS8_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2IRmJRKS8_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1907' is-artificial='yes'/>
-            <parameter type-id='type-id-2448'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1920' is-artificial='yes'/>
+            <parameter type-id='type-id-2467'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_headERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_headERS9_'>
-            <parameter type-id='type-id-1905'/>
-            <return type-id='type-id-2448'/>
+            <parameter type-id='type-id-1918'/>
+            <return type-id='type-id-2467'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_tailERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_tailERS9_'>
-            <parameter type-id='type-id-1905'/>
-            <return type-id='type-id-1908'/>
+            <parameter type-id='type-id-1918'/>
+            <return type-id='type-id-1921'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;4&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1909'>
+      <class-decl name='_Tuple_impl&lt;4&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1922'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1911' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1924' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;5, nullptr_t&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-914'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1922'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-604'/>
+      <class-decl name='_Tuple_impl&lt;5, nullptr_t&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-926'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1935'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-616'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1927' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1927' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
-            <parameter type-id='type-id-916'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1927' is-artificial='yes'/>
+            <parameter type-id='type-id-928'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm5EJDnEEC2EOS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJDnEEC2EOS0_'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
-            <parameter type-id='type-id-1913'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1927' is-artificial='yes'/>
+            <parameter type-id='type-id-1926'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;nullptr_t, void&gt;' mangled-name='_ZNSt11_Tuple_implILm5EJDnEEC2IDnJEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJDnEEC2IDnJEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1914' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1927' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm5EJDnEE7_M_headERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJDnEE7_M_headERS0_'>
-            <parameter type-id='type-id-1912'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1925'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm5EJDnEE7_M_tailERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJDnEE7_M_tailERS0_'>
-            <parameter type-id='type-id-1912'/>
-            <return type-id='type-id-1921'/>
+            <parameter type-id='type-id-1925'/>
+            <return type-id='type-id-1934'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-917'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1922'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-607'/>
+      <class-decl name='_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-929'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1935'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-619'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1930' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS8_'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
-            <parameter type-id='type-id-1147'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1930' is-artificial='yes'/>
+            <parameter type-id='type-id-1159'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2ERKS9_'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
-            <parameter type-id='type-id-919'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1930' is-artificial='yes'/>
+            <parameter type-id='type-id-931'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2EOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEC2EOS9_'>
-            <parameter type-id='type-id-1917' is-artificial='yes'/>
-            <parameter type-id='type-id-1916'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1930' is-artificial='yes'/>
+            <parameter type-id='type-id-1929'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_headERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_headERS9_'>
-            <parameter type-id='type-id-1915'/>
-            <return type-id='type-id-2073'/>
+            <parameter type-id='type-id-1928'/>
+            <return type-id='type-id-2086'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_tailERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEE7_M_tailERS9_'>
-            <parameter type-id='type-id-1915'/>
-            <return type-id='type-id-1921'/>
+            <parameter type-id='type-id-1928'/>
+            <return type-id='type-id-1934'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;5, std::mutex *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-920'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1922'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-610'/>
+      <class-decl name='_Tuple_impl&lt;5, std::mutex *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-932'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1935'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-622'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1922' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-923'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1935' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-935'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
-            <parameter type-id='type-id-2103'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-2116'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
-            <parameter type-id='type-id-922'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-934'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm5EJPSt5mutexEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJPSt5mutexEEC2EOS2_'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
-            <parameter type-id='type-id-1919'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-1932'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::mutex *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm5EJPSt5mutexEEC2IS1_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJPSt5mutexEEC2IS1_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-1920' is-artificial='yes'/>
-            <parameter type-id='type-id-2105'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1933' is-artificial='yes'/>
+            <parameter type-id='type-id-2118'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm5EJPSt5mutexEE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJPSt5mutexEE7_M_headERS2_'>
-            <parameter type-id='type-id-1918'/>
-            <return type-id='type-id-2104'/>
+            <parameter type-id='type-id-1931'/>
+            <return type-id='type-id-2117'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm5EJPSt5mutexEE7_M_tailERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm5EJPSt5mutexEE7_M_tailERS2_'>
-            <parameter type-id='type-id-1918'/>
-            <return type-id='type-id-1921'/>
+            <parameter type-id='type-id-1931'/>
+            <return type-id='type-id-1934'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;6&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1922'>
+      <class-decl name='_Tuple_impl&lt;6&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='193' column='1' id='type-id-1935'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1924' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1937' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-926'>
+      <class-decl name='_Vector_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-938'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1929'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1043'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-1942'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1055'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-2917' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-2942' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-2917' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-2942' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-2917' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-2942' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1931' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1944' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1931' is-artificial='yes'/>
-                <parameter type-id='type-id-931'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1944' is-artificial='yes'/>
+                <parameter type-id='type-id-943'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1931' is-artificial='yes'/>
-                <parameter type-id='type-id-1928'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1944' is-artificial='yes'/>
+                <parameter type-id='type-id-1941'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2725' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-929'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-2747' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-941'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1043' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-932'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1055' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-944'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2728' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2917'/>
+          <typedef-decl name='pointer' type-id='type-id-2750' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-2942'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-1929' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-1942' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-1928'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-1941'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-1925'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-1938'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <parameter type-id='type-id-1925'/>
-            <parameter type-id='type-id-934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <parameter type-id='type-id-1938'/>
+            <parameter type-id='type-id-946'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1926' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1939' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2733'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2965'/>
+      <class-decl name='_Weak_result_type&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2755'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2990'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2735'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2966'/>
+      <class-decl name='_Weak_result_type&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2757'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2991'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2736'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2967'/>
+      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2758'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2992'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2738'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2968'/>
+      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2760'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2993'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2740'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2969'/>
+      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2762'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2994'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2741'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2970'/>
+      <class-decl name='_Weak_result_type&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2763'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2995'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2742'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2971'/>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2764'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2996'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2744'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2972'/>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2766'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2997'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2746'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2973'/>
+      <class-decl name='_Weak_result_type&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-2768'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2998'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2965'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2944'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2990'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2969'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2966'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2945'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2991'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2970'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2967'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2946'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2992'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2971'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2968'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2947'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2993'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2972'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2969'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2948'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2994'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2973'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2970'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2949'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-2995'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2974'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2971'/>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2972'/>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2973'/>
-      <class-decl name='__add_c_ref&lt;mongo::executor::NetworkInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='53' column='1' id='type-id-2974'>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2996'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2997'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-2998'/>
+      <class-decl name='__add_c_ref&lt;mongo::executor::NetworkInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='53' column='1' id='type-id-2999'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2599' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-2975'/>
+          <typedef-decl name='type' type-id='type-id-2620' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-3000'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_c_ref&lt;std::basic_ostringstream&lt;char&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='53' column='1' id='type-id-2976'>
+      <class-decl name='__add_c_ref&lt;std::basic_ostringstream&lt;char&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='53' column='1' id='type-id-3001'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-2977'/>
+          <typedef-decl name='type' type-id='type-id-2658' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='54' column='1' id='type-id-3002'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::NetworkInterface, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2978'>
+      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::NetworkInterface, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3003'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2596' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2979'/>
+          <typedef-decl name='type' type-id='type-id-2617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3004'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackState, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2980'>
+      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackState, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3005'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2604' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2981'/>
+          <typedef-decl name='type' type-id='type-id-2625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3006'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2604' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2982'/>
+          <typedef-decl name='type' type-id='type-id-2625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3007'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::EventState, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2983'>
+      <class-decl name='__add_lvalue_reference_helper&lt;mongo::executor::TaskExecutor::EventState, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3008'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2608' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2984'/>
+          <typedef-decl name='type' type-id='type-id-2629' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3009'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2608' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2985'/>
+          <typedef-decl name='type' type-id='type-id-2629' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3010'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::ReplicationExecutor::Event, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2986'>
+      <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::ReplicationExecutor::Event, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3011'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2987'/>
+          <typedef-decl name='type' type-id='type-id-1518' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3012'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::StorageInterface, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2988'>
+      <class-decl name='__add_lvalue_reference_helper&lt;mongo::repl::StorageInterface, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3013'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2621' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2989'/>
+          <typedef-decl name='type' type-id='type-id-2641' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3014'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;std::basic_ostringstream&lt;char&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2990'>
+      <class-decl name='__add_lvalue_reference_helper&lt;std::basic_ostringstream&lt;char&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3015'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2898'/>
+          <typedef-decl name='type' type-id='type-id-2655' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2923'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;std::lock_guard&lt;std::mutex&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2991'>
+      <class-decl name='__add_lvalue_reference_helper&lt;std::lock_guard&lt;std::mutex&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3016'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2095' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2992'/>
+          <typedef-decl name='type' type-id='type-id-2108' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3017'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2993'>
+      <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3018'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2349' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2994'/>
+          <typedef-decl name='type' type-id='type-id-2368' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3019'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl_base, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-2995'>
+      <class-decl name='__add_lvalue_reference_helper&lt;std::thread::_Impl_base, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1516' column='1' id='type-id-3020'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2352' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-2996'/>
+          <typedef-decl name='type' type-id='type-id-2371' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1517' column='1' id='type-id-3021'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-2997'>
+      <class-decl name='__add_ref&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3022'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-360' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2805'/>
+          <typedef-decl name='type' type-id='type-id-373' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2830'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-2998'>
+      <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3023'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-394' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2808'/>
+          <typedef-decl name='type' type-id='type-id-407' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2833'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::OperationContext *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-2999'>
+      <class-decl name='__add_ref&lt;mongo::OperationContext *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3024'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2593' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3000'/>
+          <typedef-decl name='type' type-id='type-id-2614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-3025'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3001'>
+      <class-decl name='__add_ref&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3026'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2593' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3002'/>
+          <typedef-decl name='type' type-id='type-id-2614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3027'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3003'>
+      <class-decl name='__add_ref&lt;mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3028'>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3004'>
+      <class-decl name='__add_ref&lt;mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3029'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1442' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2821'/>
+          <typedef-decl name='type' type-id='type-id-1455' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2846'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3005'>
+      <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3030'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1447' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3006'/>
+          <typedef-decl name='type' type-id='type-id-1460' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3031'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::NetworkInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3007'>
+      <class-decl name='__add_ref&lt;mongo::executor::NetworkInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3032'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2600' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3008'/>
+          <typedef-decl name='type' type-id='type-id-2621' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3033'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3009'>
+      <class-decl name='__add_ref&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3034'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1462' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3010'/>
+          <typedef-decl name='type' type-id='type-id-1475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3035'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3011'>
+      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3036'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3012'/>
+          <typedef-decl name='type' type-id='type-id-1481' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3037'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3013'>
+      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3038'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2817'/>
+          <typedef-decl name='type' type-id='type-id-1484' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-2842'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3014'>
+      <class-decl name='__add_ref&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3039'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3015'/>
+          <typedef-decl name='type' type-id='type-id-1514' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3040'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3016'>
+      <class-decl name='__add_ref&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3041'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2625' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3017'/>
+          <typedef-decl name='type' type-id='type-id-2646' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3042'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3018'/>
-      <class-decl name='__add_ref&lt;std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3019'>
+      <class-decl name='__add_ref&lt;nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3043'/>
+      <class-decl name='__add_ref&lt;std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3044'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1721' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3020'/>
+          <typedef-decl name='type' type-id='type-id-1734' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3045'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::_Placeholder&lt;2&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3021'>
+      <class-decl name='__add_ref&lt;std::_Placeholder&lt;2&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3046'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1723' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3022'/>
+          <typedef-decl name='type' type-id='type-id-1736' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3047'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3023'>
+      <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3048'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2046' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3024'/>
+          <typedef-decl name='type' type-id='type-id-2059' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3049'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3025'>
+      <class-decl name='__add_ref&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3050'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2049' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3026'/>
+          <typedef-decl name='type' type-id='type-id-2062' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3051'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3027'>
+      <class-decl name='__add_ref&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3052'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2054' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3028'/>
+          <typedef-decl name='type' type-id='type-id-2067' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3053'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3029'>
+      <class-decl name='__add_ref&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3054'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3030'/>
+          <typedef-decl name='type' type-id='type-id-2077' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3055'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3031'>
+      <class-decl name='__add_ref&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3056'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3032'/>
+          <typedef-decl name='type' type-id='type-id-2086' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3057'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3033'>
+      <class-decl name='__add_ref&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3058'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2090' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3034'/>
+          <typedef-decl name='type' type-id='type-id-2103' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3059'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::lock_guard&lt;std::mutex&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3035'>
+      <class-decl name='__add_ref&lt;std::lock_guard&lt;std::mutex&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3060'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2099' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3036'/>
+          <typedef-decl name='type' type-id='type-id-2112' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3061'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3037'>
+      <class-decl name='__add_ref&lt;std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3062'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2104' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3038'/>
+          <typedef-decl name='type' type-id='type-id-2117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3063'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;unsigned long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3039'>
+      <class-decl name='__add_ref&lt;unsigned long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3064'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2448' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3040'/>
+          <typedef-decl name='type' type-id='type-id-2467' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3065'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3041'>
+      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3066'>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3042'>
+      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3067'>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;mongo::OperationContext *&amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3043'>
+      <class-decl name='__add_rvalue_reference_helper&lt;mongo::OperationContext *&amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3068'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2593' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2814'/>
+          <typedef-decl name='type' type-id='type-id-2614' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2839'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;mongo::Status &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3044'>
+      <class-decl name='__add_rvalue_reference_helper&lt;mongo::Status &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3069'>
       </class-decl>
-      <class-decl name='__alloc_neq&lt;std::allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='177' column='1' id='type-id-3045'>
+      <class-decl name='__alloc_neq&lt;std::allocator&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='177' column='1' id='type-id-3070'>
         <member-function access='public' static='yes'>
           <function-decl name='_S_do_it' mangled-name='_ZNSt11__alloc_neqISaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEELb1EE8_S_do_itERKS6_S9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11__alloc_neqISaISt10_List_nodeIN5mongo4repl19ReplicationExecutor8WorkItemEEELb1EE8_S_do_itERKS6_S9_'>
-            <parameter type-id='type-id-1058'/>
-            <parameter type-id='type-id-1058'/>
+            <parameter type-id='type-id-1070'/>
+            <parameter type-id='type-id-1070'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3046'>
+      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3071'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-2834' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3047'/>
+          <typedef-decl name='__type' type-id='type-id-2859' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3072'/>
         </member-type>
       </class-decl>
-      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-935'>
+      <class-decl name='__atomic_base&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='353' column='1' id='type-id-947'>
         <member-type access='public'>
-          <typedef-decl name='__int_type' type-id='type-id-48' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1934'/>
+          <typedef-decl name='__int_type' type-id='type-id-53' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='356' column='1' id='type-id-1947'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_i' type-id='type-id-1934' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='358' column='1'/>
+          <var-decl name='_M_i' type-id='type-id-1947' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='358' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-949'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-1934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-1947'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetch_sub' mangled-name='_ZNSt13__atomic_baseIjE9fetch_subEjSt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-1934'/>
-            <parameter type-id='type-id-3048'/>
-            <return type-id='type-id-1934'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-1947'/>
+            <parameter type-id='type-id-3073'/>
+            <return type-id='type-id-1947'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetch_add' mangled-name='_ZNSt13__atomic_baseIjE9fetch_addEjSt12memory_order' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-1934'/>
-            <parameter type-id='type-id-3048'/>
-            <return type-id='type-id-1934'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-1947'/>
+            <parameter type-id='type-id-3073'/>
+            <return type-id='type-id-1947'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='363' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-949'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__atomic_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1933' is-artificial='yes'/>
-            <parameter type-id='type-id-1934'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1946' is-artificial='yes'/>
+            <parameter type-id='type-id-1947'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__cv_selector&lt;unsigned long, false, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1560' column='1' id='type-id-3049'>
+      <class-decl name='__cv_selector&lt;unsigned long, false, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1560' column='1' id='type-id-3074'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-91' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1561' column='1' id='type-id-2827'/>
+          <typedef-decl name='__type' type-id='type-id-96' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1561' column='1' id='type-id-2852'/>
         </member-type>
       </class-decl>
-      <class-decl name='__hash_base&lt;unsigned long, std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/functional_hash.h' line='50' column='1' id='type-id-3050'/>
-      <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-3051'>
+      <class-decl name='__hash_base&lt;unsigned long, std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/functional_hash.h' line='50' column='1' id='type-id-3075'/>
+      <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-3076'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-3053' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-3052'/>
+          <typedef-decl name='difference_type' type-id='type-id-3078' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='153' column='1' id='type-id-3077'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-2938' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='151' column='1' id='type-id-3054'/>
+          <typedef-decl name='iterator_category' type-id='type-id-2963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='151' column='1' id='type-id-3079'/>
         </member-type>
       </class-decl>
-      <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-3055'>
+      <class-decl name='__iterator_traits&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='149' column='1' id='type-id-3080'>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3056'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3081'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-2612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-2628'/>
+          <typedef-decl name='__type' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-2650'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3057'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor::Event&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3082'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-441' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1978'/>
+          <typedef-decl name='__type' type-id='type-id-453' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1991'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3058'>
+      <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3083'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1980'/>
+          <typedef-decl name='__type' type-id='type-id-699' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1993'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3059'>
+      <class-decl name='__ptrtr_not_void&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3084'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-691' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1982'/>
+          <typedef-decl name='__type' type-id='type-id-703' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1995'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3060'>
+      <class-decl name='__ptrtr_not_void&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3085'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1215' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1984'/>
+          <typedef-decl name='__type' type-id='type-id-1227' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-1997'/>
         </member-type>
       </class-decl>
-      <class-decl name='__success_type&lt;void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='154' column='1' id='type-id-3061'>
+      <class-decl name='__success_type&lt;void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='154' column='1' id='type-id-3086'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='155' column='1' id='type-id-2515'/>
+          <typedef-decl name='type' type-id='type-id-2697' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='155' column='1' id='type-id-2536'/>
         </member-type>
       </class-decl>
-      <class-decl name='__uses_alloc0' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='69' column='1' id='type-id-2937'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3062'/>
+      <class-decl name='__uses_alloc0' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='69' column='1' id='type-id-2962'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3087'/>
         <member-type access='public'>
-          <class-decl name='_Anything' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='70' column='1' id='type-id-2003'>
+          <class-decl name='_Anything' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='70' column='1' id='type-id-2016'>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Anything' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2004' is-artificial='yes'/>
+                <parameter type-id='type-id-2017' is-artificial='yes'/>
                 <parameter is-variadic='yes'/>
-                <return type-id='type-id-2675'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_a' type-id='type-id-2003' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='70' column='1'/>
+          <var-decl name='_M_a' type-id='type-id-2016' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='70' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='__uses_alloc_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='68' column='1' id='type-id-3062'/>
-      <class-decl name='adopt_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='361' column='1' id='type-id-2877'/>
-      <class-decl name='aligned_storage&lt;16, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2718'>
+      <class-decl name='__uses_alloc_base' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='68' column='1' id='type-id-3087'/>
+      <class-decl name='adopt_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='361' column='1' id='type-id-2902'/>
+      <class-decl name='aligned_storage&lt;16, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2740'>
         <member-type access='public'>
-          <union-decl name='type' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2719'>
+          <union-decl name='type' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2741'>
             <data-member access='public'>
-              <var-decl name='__data' type-id='type-id-106' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
+              <var-decl name='__data' type-id='type-id-111' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='__align' type-id='type-id-3063' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
+              <var-decl name='__align' type-id='type-id-3088' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
       </class-decl>
-      <class-decl name='aligned_storage&lt;32, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2720'>
+      <class-decl name='aligned_storage&lt;32, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2742'>
         <member-type access='public'>
-          <union-decl name='type' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2721'>
+          <union-decl name='type' size-in-bits='256' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2743'>
             <data-member access='public'>
-              <var-decl name='__data' type-id='type-id-107' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
+              <var-decl name='__data' type-id='type-id-112' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='__align' type-id='type-id-3063' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
+              <var-decl name='__align' type-id='type-id-3088' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
       </class-decl>
-      <class-decl name='aligned_storage&lt;96, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2716'>
+      <class-decl name='aligned_storage&lt;96, 8&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1881' column='1' id='type-id-2738'>
         <member-type access='public'>
-          <union-decl name='type' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2717'>
+          <union-decl name='type' size-in-bits='768' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1883' column='1' id='type-id-2739'>
             <member-type access='public'>
-              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1' id='type-id-3063'/>
+              <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1' id='type-id-3088'/>
             </member-type>
             <data-member access='public'>
-              <var-decl name='__data' type-id='type-id-109' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
+              <var-decl name='__data' type-id='type-id-114' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1885' column='1'/>
             </data-member>
             <data-member access='public'>
-              <var-decl name='__align' type-id='type-id-3063' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
+              <var-decl name='__align' type-id='type-id-3088' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1886' column='1'/>
             </data-member>
           </union-decl>
         </member-type>
       </class-decl>
-      <class-decl name='allocator_arg_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='39' column='1' id='type-id-2936'/>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2723'>
+      <class-decl name='allocator_arg_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/uses_allocator.h' line='39' column='1' id='type-id-2961'/>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-2745'>
         <member-type access='public'>
-          <typedef-decl name='__size_type' type-id='type-id-93' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-3064'/>
+          <typedef-decl name='__size_type' type-id='type-id-98' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='148' column='1' id='type-id-3089'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-3047' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2726'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-3072' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-2748'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-3064' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-3065'/>
+          <typedef-decl name='size_type' type-id='type-id-3089' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='157' column='1' id='type-id-3090'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3067' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3066'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3091'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-2835' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3068'/>
+          <typedef-decl name='__pointer' type-id='type-id-2860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3093'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3066' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3069'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3091' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3094'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3068' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2729'/>
+          <typedef-decl name='pointer' type-id='type-id-3093' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-2751'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2836' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2630'/>
+          <typedef-decl name='value_type' type-id='type-id-2861' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2652'/>
         </member-type>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3070'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3095'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-2682' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3071'/>
+          <typedef-decl name='__pointer' type-id='type-id-2704' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3096'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3071' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3072'/>
+          <typedef-decl name='pointer' type-id='type-id-3096' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3097'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2837' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2024'/>
+          <typedef-decl name='value_type' type-id='type-id-2862' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2037'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3074' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3073'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3099' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3098'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3073' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3075'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3098' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3100'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE9constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE9constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOSE_'>
-            <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1506'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-3076'/>
+            <parameter type-id='type-id-2023'/>
+            <parameter type-id='type-id-1519'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-3101'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE7destroyIS3_EEvRS4_PT_'>
-            <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1506'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2023'/>
+            <parameter type-id='type-id-1519'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;mongo::repl::ReplicationExecutor::Event&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_'>
-            <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1506'/>
-            <return type-id='type-id-3077'/>
+            <parameter type-id='type-id-2023'/>
+            <parameter type-id='type-id-1519'/>
+            <return type-id='type-id-3102'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE12_S_constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSG_DpOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo4repl19ReplicationExecutor5EventEEE12_S_constructIS3_JPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSG_DpOSH_'>
-            <parameter type-id='type-id-2010'/>
-            <parameter type-id='type-id-1506'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-3076'/>
+            <parameter type-id='type-id-2023'/>
+            <parameter type-id='type-id-1519'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-3101'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3078'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3103'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-2698' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3079'/>
+          <typedef-decl name='__pointer' type-id='type-id-2720' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3104'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1059' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3080'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1071' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3105'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3079' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3081'/>
+          <typedef-decl name='pointer' type-id='type-id-3104' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3106'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2840' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2026'/>
+          <typedef-decl name='value_type' type-id='type-id-2865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2039'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3082'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3108' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3107'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3082' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3084'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3107' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3109'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE8allocateERS9_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE8allocateERS9_m'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-3081'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-3106'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE9constructIS8_JKS5_PS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS9_PT_DpOSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE9constructIS8_JKS5_PS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS9_PT_DpOSK_'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-1730'/>
-            <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-3085'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-1743'/>
+            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-3110'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE10deallocateERS9_PS8_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE10deallocateERS9_PS8_m'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-3081'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-3106'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE12_S_constructIS8_JKS5_PS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INSA_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS9_PSM_DpOSN_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE12_S_constructIS8_JKS5_PS3_RSt14_List_iteratorINS1_8executor12TaskExecutor11EventHandleEEEEENSt9enable_ifIXsr6__and_INSA_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS9_PSM_DpOSN_'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-1730'/>
-            <parameter type-id='type-id-1049'/>
-            <parameter type-id='type-id-1502'/>
-            <parameter type-id='type-id-1703'/>
-            <return type-id='type-id-3085'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-1743'/>
+            <parameter type-id='type-id-1061'/>
+            <parameter type-id='type-id-1515'/>
+            <parameter type-id='type-id-1716'/>
+            <return type-id='type-id-3110'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyIS8_EEvRS9_PT_'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-1730'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-1743'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE10_S_destroyIS8_EENSt9enable_ifIXsr6__and_INSA_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS9_PSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceIN5mongo4repl19ReplicationExecutor5EventESaIS4_ELN9__gnu_cxx12_Lock_policyE2EEEE10_S_destroyIS8_EENSt9enable_ifIXsr6__and_INSA_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS9_PSE_'>
-            <parameter type-id='type-id-2015'/>
-            <parameter type-id='type-id-1730'/>
-            <return type-id='type-id-3086'/>
+            <parameter type-id='type-id-2028'/>
+            <parameter type-id='type-id-1743'/>
+            <return type-id='type-id-3111'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3087'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3112'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-2702' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3088'/>
+          <typedef-decl name='__pointer' type-id='type-id-2724' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3113'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-1062' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3089'/>
+          <typedef-decl name='allocator_type' type-id='type-id-1074' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='83' column='1' id='type-id-3114'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3088' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3090'/>
+          <typedef-decl name='pointer' type-id='type-id-3113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3115'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2841' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2028'/>
+          <typedef-decl name='value_type' type-id='type-id-2866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2041'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3091'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3116'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3091' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3093'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3116' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3118'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE8allocateERSF_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-3090'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-3115'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE9constructISE_JKSB_S9_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERSF_PT_DpOSJ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
-            <parameter type-id='type-id-1734'/>
-            <parameter type-id='type-id-1074'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-3094'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-1747'/>
+            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-3119'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE10deallocateERSF_PSE_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-3115'/>
             <parameter type-id='type-id-3090'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE12_S_constructISE_JKSB_S9_EEENSt9enable_ifIXsr6__and_INSG_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERSF_PSL_DpOSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
-            <parameter type-id='type-id-1734'/>
-            <parameter type-id='type-id-1074'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-3094'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-1747'/>
+            <parameter type-id='type-id-1086'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-3119'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE7destroyISE_EEvRSF_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
-            <parameter type-id='type-id-1734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-1747'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEESaISA_ELN9__gnu_cxx12_Lock_policyE2EEEE10_S_destroyISE_EENSt9enable_ifIXsr6__and_INSG_16__destroy_helperIT_E4typeEEE5valueEvE4typeERSF_PSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2017'/>
-            <parameter type-id='type-id-1734'/>
-            <return type-id='type-id-3095'/>
+            <parameter type-id='type-id-2030'/>
+            <parameter type-id='type-id-1747'/>
+            <return type-id='type-id-3120'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3096'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3121'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-2714' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3097'/>
+          <typedef-decl name='__pointer' type-id='type-id-2736' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3122'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3097' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3098'/>
+          <typedef-decl name='pointer' type-id='type-id-3122' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3123'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-2843' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2030'/>
+          <typedef-decl name='value_type' type-id='type-id-2868' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-2043'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3100' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3099'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3125' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3124'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3099' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3101'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3124' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3126'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEE9constructIS9_JS8_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERSA_PT_DpOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2022'/>
-            <parameter type-id='type-id-2350'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-3102'/>
+            <parameter type-id='type-id-2035'/>
+            <parameter type-id='type-id-2369'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-3127'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEE7destroyIS9_EEvRSA_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2022'/>
-            <parameter type-id='type-id-2350'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2035'/>
+            <parameter type-id='type-id-2369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEE10_S_destroyIS9_EENSt9enable_ifIXsr6__and_INSB_16__destroy_helperIT_E4typeEEE5valueEvE4typeERSA_PSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2022'/>
-            <parameter type-id='type-id-2350'/>
-            <return type-id='type-id-3103'/>
+            <parameter type-id='type-id-2035'/>
+            <parameter type-id='type-id-2369'/>
+            <return type-id='type-id-3128'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFZN5mongo4repl19ReplicationExecutor7startupEvE3$_0vEEEEEE12_S_constructIS9_JS8_EEENSt9enable_ifIXsr6__and_INSB_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERSA_PSF_DpOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2022'/>
-            <parameter type-id='type-id-2350'/>
-            <parameter type-id='type-id-1573'/>
-            <return type-id='type-id-3102'/>
+            <parameter type-id='type-id-2035'/>
+            <parameter type-id='type-id-2369'/>
+            <parameter type-id='type-id-1586'/>
+            <return type-id='type-id-3127'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='617' column='1' id='type-id-1075'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-935'/>
+      <class-decl name='atomic&lt;unsigned int&gt;' size-in-bits='32' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='617' column='1' id='type-id-1087'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-947'/>
         <member-type access='public'>
-          <typedef-decl name='__integral_type' type-id='type-id-48' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='619' column='1' id='type-id-3104'/>
+          <typedef-decl name='__integral_type' type-id='type-id-53' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='619' column='1' id='type-id-3129'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='atomic' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='622' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2033' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2046' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~atomic' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='623' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2033' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2046' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='atomic' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='624' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2033' is-artificial='yes'/>
-            <parameter type-id='type-id-1077'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2046' is-artificial='yes'/>
+            <parameter type-id='type-id-1089'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='atomic' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/atomic' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2033' is-artificial='yes'/>
-            <parameter type-id='type-id-3104'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2046' is-artificial='yes'/>
+            <parameter type-id='type-id-3129'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='99' column='1' id='type-id-2939'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3105'/>
+      <class-decl name='bidirectional_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='99' column='1' id='type-id-2964'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3130'/>
       </class-decl>
-      <class-decl name='binary_function&lt;mongo::OperationContext *, const mongo::Status &amp;, mongo::repl::TaskRunner::NextAction&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2951'/>
-      <class-decl name='binary_function&lt;std::basic_string&lt;char&gt;, std::basic_string&lt;char&gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-3106'/>
-      <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, const std::default_delete&lt;mongo::executor::NetworkInterface&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3107'>
+      <class-decl name='binary_function&lt;mongo::OperationContext *, const mongo::Status &amp;, mongo::repl::TaskRunner::NextAction&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-2976'/>
+      <class-decl name='binary_function&lt;std::basic_string&lt;char&gt;, std::basic_string&lt;char&gt;, bool&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-3131'/>
+      <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::executor::NetworkInterface&gt;, const std::default_delete&lt;mongo::executor::NetworkInterface&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3132'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1107' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2887'/>
+          <typedef-decl name='type' type-id='type-id-1119' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2912'/>
         </member-type>
       </class-decl>
-      <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::repl::StorageInterface&gt;, const std::default_delete&lt;mongo::repl::StorageInterface&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3108'>
+      <class-decl name='conditional&lt;false, std::default_delete&lt;mongo::repl::StorageInterface&gt;, const std::default_delete&lt;mongo::repl::StorageInterface&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3133'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1111' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2892'/>
+          <typedef-decl name='type' type-id='type-id-1123' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2917'/>
         </member-type>
       </class-decl>
-      <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3109'>
+      <class-decl name='conditional&lt;false, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;, const std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3134'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1115' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2897'/>
+          <typedef-decl name='type' type-id='type-id-1127' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2922'/>
         </member-type>
       </class-decl>
-      <class-decl name='conditional&lt;false, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, const std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3110'>
+      <class-decl name='conditional&lt;false, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;, const std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1967' column='1' id='type-id-3135'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1119' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2902'/>
+          <typedef-decl name='type' type-id='type-id-1131' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1968' column='1' id='type-id-2927'/>
         </member-type>
       </class-decl>
-      <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1962' column='1' id='type-id-3111'>
+      <class-decl name='conditional&lt;true, std::pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1962' column='1' id='type-id-3136'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1963' column='1' id='type-id-3112'/>
+          <typedef-decl name='type' type-id='type-id-3138' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1963' column='1' id='type-id-3137'/>
         </member-type>
       </class-decl>
-      <class-decl name='default_delete&lt;mongo::executor::NetworkInterface&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1105'>
+      <class-decl name='default_delete&lt;mongo::executor::NetworkInterface&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1117'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2048' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2061' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo8executor16NetworkInterfaceEEclEPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14default_deleteIN5mongo8executor16NetworkInterfaceEEclEPS2_'>
-            <parameter type-id='type-id-1108' is-artificial='yes'/>
-            <parameter type-id='type-id-2597'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1120' is-artificial='yes'/>
+            <parameter type-id='type-id-2618'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='default_delete&lt;mongo::repl::StorageInterface&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1109'>
+      <class-decl name='default_delete&lt;mongo::repl::StorageInterface&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1121'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2051' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2064' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo4repl16StorageInterfaceEEclEPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14default_deleteIN5mongo4repl16StorageInterfaceEEclEPS2_'>
-            <parameter type-id='type-id-1112' is-artificial='yes'/>
-            <parameter type-id='type-id-2622'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1124' is-artificial='yes'/>
+            <parameter type-id='type-id-2642'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1113'>
+      <class-decl name='default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1125'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2053' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2066' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1117'>
+      <class-decl name='default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='54' column='1' id='type-id-1129'>
         <member-function access='public'>
           <function-decl name='default_delete' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2056' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2069' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteISt10lock_guardISt5mutexEEclEPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14default_deleteISt10lock_guardISt5mutexEEclEPS2_'>
-            <parameter type-id='type-id-1120' is-artificial='yes'/>
-            <parameter type-id='type-id-2096'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1132' is-artificial='yes'/>
+            <parameter type-id='type-id-2109'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='defer_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='354' column='1' id='type-id-2881'/>
-      <class-decl name='enable_if&lt;true, std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3114'>
+      <class-decl name='defer_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='354' column='1' id='type-id-2906'/>
+      <class-decl name='enable_if&lt;true, std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3139'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1085' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-3115'/>
+          <typedef-decl name='type' type-id='type-id-1097' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-3140'/>
         </member-type>
       </class-decl>
-      <class-decl name='enable_if&lt;true, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3116'>
+      <class-decl name='enable_if&lt;true, std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3141'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2070' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-2856'/>
+          <typedef-decl name='type' type-id='type-id-2083' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1954' column='1' id='type-id-2881'/>
         </member-type>
       </class-decl>
-      <class-decl name='enable_if&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3117'>
+      <class-decl name='enable_if&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1953' column='1' id='type-id-3142'>
       </class-decl>
-      <class-decl name='equal_to&lt;std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1121'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3106'/>
+      <class-decl name='equal_to&lt;std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='340' column='1' id='type-id-1133'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3131'/>
       </class-decl>
-      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='95' column='1' id='type-id-3105'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3118'/>
+      <class-decl name='forward_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='95' column='1' id='type-id-3130'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3143'/>
       </class-decl>
-      <class-decl name='hash&lt;std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1149'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3050'/>
+      <class-decl name='hash&lt;std::basic_string&lt;char&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/basic_string.h' line='3079' column='1' id='type-id-1161'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3075'/>
       </class-decl>
-      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-3118'/>
-      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='69' column='1' id='type-id-1153'>
+      <class-decl name='input_iterator_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='89' column='1' id='type-id-3143'/>
+      <class-decl name='integral_constant&lt;bool, false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='69' column='1' id='type-id-1165'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='72' column='1' id='type-id-3119'/>
+          <typedef-decl name='value_type' type-id='type-id-1' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='72' column='1' id='type-id-3144'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='69' column='1' id='type-id-1156'>
+      <class-decl name='integral_constant&lt;bool, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='69' column='1' id='type-id-1168'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='71' column='1'/>
+          <var-decl name='value' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='71' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='make_unsigned&lt;long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1666' column='1' id='type-id-3120'>
+      <class-decl name='make_unsigned&lt;long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1666' column='1' id='type-id-3145'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2824' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1667' column='1' id='type-id-3121'/>
+          <typedef-decl name='type' type-id='type-id-2849' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1667' column='1' id='type-id-3146'/>
         </member-type>
       </class-decl>
-      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/new' line='99' column='1' id='type-id-2828'/>
-      <class-decl name='pair&lt;bool, unsigned long&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1185'>
+      <class-decl name='nothrow_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/new' line='99' column='1' id='type-id-2853'/>
+      <class-decl name='pair&lt;bool, unsigned long&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1197'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='first' type-id='type-id-1' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-91' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-96' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2123' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <parameter type-id='type-id-237'/>
-            <parameter type-id='type-id-1335'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2123' is-artificial='yes'/>
+            <parameter type-id='type-id-250'/>
+            <parameter type-id='type-id-1347'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <parameter type-id='type-id-1187'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2123' is-artificial='yes'/>
+            <parameter type-id='type-id-1199'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2110' is-artificial='yes'/>
-            <parameter type-id='type-id-2109'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2123' is-artificial='yes'/>
+            <parameter type-id='type-id-2122'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1188'>
+      <class-decl name='pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1200'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-2550' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-2571' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='second' type-id='type-id-1485' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-1498' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2126' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <parameter type-id='type-id-2551'/>
-            <parameter type-id='type-id-1487'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2126' is-artificial='yes'/>
+            <parameter type-id='type-id-2572'/>
+            <parameter type-id='type-id-1500'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <parameter type-id='type-id-1190'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2126' is-artificial='yes'/>
+            <parameter type-id='type-id-1202'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2113' is-artificial='yes'/>
-            <parameter type-id='type-id-2112'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2126' is-artificial='yes'/>
+            <parameter type-id='type-id-2125'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1192'>
+      <class-decl name='pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='576' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='96' column='1' id='type-id-1204'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='first' type-id='type-id-445' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
+          <var-decl name='first' type-id='type-id-457' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='101' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='second' type-id='type-id-398' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
+          <var-decl name='second' type-id='type-id-411' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='102' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='pair' mangled-name='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' mangled-name='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2ERKS3_RKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2ERKS3_RKS6_'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-447'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <parameter type-id='type-id-459'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-1194'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <parameter type-id='type-id-1206'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-2115'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <parameter type-id='type-id-2128'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle, void&gt;' mangled-name='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2IS3_S6_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEC2IS3_S6_vEEOT_OT0_'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-1508'/>
-            <parameter type-id='type-id-1472'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <parameter type-id='type-id-1521'/>
+            <parameter type-id='type-id-1485'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEaSEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt4pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEEaSEOS7_'>
-            <parameter type-id='type-id-2116' is-artificial='yes'/>
-            <parameter type-id='type-id-2115'/>
-            <return type-id='type-id-2114'/>
+            <parameter type-id='type-id-2129' is-artificial='yes'/>
+            <parameter type-id='type-id-2128'/>
+            <return type-id='type-id-2127'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pointer_traits&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3122'>
+      <class-decl name='pointer_traits&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3147'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-3123' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-3053'/>
+          <typedef-decl name='difference_type' type-id='type-id-3148' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-3078'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-3124'/>
+          <typedef-decl name='pointer' type-id='type-id-2638' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='153' column='1' id='type-id-3149'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2615' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3125'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2636' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3150'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3067'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3092'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3126'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3151'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;mongo::repl::ReplicationExecutor::Event *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3127'>
+      <class-decl name='pointer_traits&lt;mongo::repl::ReplicationExecutor::Event *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3152'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-444' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3128'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-456' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3153'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3074'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3099'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3129'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3154'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3130'>
+      <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3155'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3131'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-702' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3156'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3083'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3108'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3132'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3157'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3133'>
+      <class-decl name='pointer_traits&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3158'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-694' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3134'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-706' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3159'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3092'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3117'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3135'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3160'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3136'>
+      <class-decl name='pointer_traits&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3161'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-1218' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3137'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-1230' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3162'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3100'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3125'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3138'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3163'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;bool (*&amp;)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3139'>
+      <class-decl name='remove_reference&lt;bool (*&amp;)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3164'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-144' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2117'/>
+          <typedef-decl name='type' type-id='type-id-157' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2130'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const char *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3140'>
+      <class-decl name='remove_reference&lt;const char *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3165'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2119'/>
+          <typedef-decl name='type' type-id='type-id-63' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2132'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3141'>
+      <class-decl name='remove_reference&lt;const mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3166'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-355' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2121'/>
+          <typedef-decl name='type' type-id='type-id-368' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2134'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3142'>
+      <class-decl name='remove_reference&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3167'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-359' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2123'/>
+          <typedef-decl name='type' type-id='type-id-372' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2136'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3143'>
+      <class-decl name='remove_reference&lt;const mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3168'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-385' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2125'/>
+          <typedef-decl name='type' type-id='type-id-398' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2138'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3144'>
+      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3169'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-393' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2127'/>
+          <typedef-decl name='type' type-id='type-id-406' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2140'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3145'>
+      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3170'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-399' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2129'/>
+          <typedef-decl name='type' type-id='type-id-412' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2142'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3146'>
+      <class-decl name='remove_reference&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3171'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-407' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2131'/>
+          <typedef-decl name='type' type-id='type-id-420' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2144'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3147'>
+      <class-decl name='remove_reference&lt;const mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3172'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-446' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2133'/>
+          <typedef-decl name='type' type-id='type-id-458' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2146'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3148'>
+      <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3173'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2135'/>
+          <typedef-decl name='type' type-id='type-id-487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2148'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3149'>
+      <class-decl name='remove_reference&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3174'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-478' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2137'/>
+          <typedef-decl name='type' type-id='type-id-490' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2150'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::_Placeholder&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3150'>
+      <class-decl name='remove_reference&lt;const std::_Placeholder&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3175'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-675' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2139'/>
+          <typedef-decl name='type' type-id='type-id-687' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2152'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::_Placeholder&lt;2&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3151'>
+      <class-decl name='remove_reference&lt;const std::_Placeholder&lt;2&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3176'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-678' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2141'/>
+          <typedef-decl name='type' type-id='type-id-690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2154'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3152'>
+      <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3177'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1047' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2143'/>
+          <typedef-decl name='type' type-id='type-id-1059' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2156'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3153'>
+      <class-decl name='remove_reference&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3178'>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3154'>
+      <class-decl name='remove_reference&lt;const std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3179'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1134' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2146'/>
+          <typedef-decl name='type' type-id='type-id-1146' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2159'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3155'>
+      <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3180'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1142' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2148'/>
+          <typedef-decl name='type' type-id='type-id-1154' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2161'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3156'>
+      <class-decl name='remove_reference&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3181'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1146' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2150'/>
+          <typedef-decl name='type' type-id='type-id-1158' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2163'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::OperationContext *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3157'>
+      <class-decl name='remove_reference&lt;mongo::OperationContext *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3182'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2590' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2645'/>
+          <typedef-decl name='type' type-id='type-id-2611' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2667'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3158'/>
-      <class-decl name='remove_reference&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3159'>
+      <class-decl name='remove_reference&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3183'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2590' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2647'/>
+          <typedef-decl name='type' type-id='type-id-48' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2165'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::SharedBuffer &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3160'>
+      <class-decl name='remove_reference&lt;mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3184'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-347' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2152'/>
+          <typedef-decl name='type' type-id='type-id-2611' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2669'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3161'>
+      <class-decl name='remove_reference&lt;mongo::SharedBuffer &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3185'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-354' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2154'/>
+          <typedef-decl name='type' type-id='type-id-360' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2167'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3162'>
+      <class-decl name='remove_reference&lt;mongo::Status &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3186'>
+        <member-type access='public'>
+          <typedef-decl name='type' type-id='type-id-367' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2169'/>
+        </member-type>
+      </class-decl>
+      <class-decl name='remove_reference&lt;mongo::Status&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3187'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3163'>
+      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3188'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-358' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2157'/>
+          <typedef-decl name='type' type-id='type-id-371' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2172'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3164'>
+      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3189'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::NetworkInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3165'>
+      <class-decl name='remove_reference&lt;mongo::executor::NetworkInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3190'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2649'/>
+          <typedef-decl name='type' type-id='type-id-2618' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2671'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3166'>
+      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3191'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-384' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2159'/>
+          <typedef-decl name='type' type-id='type-id-397' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2174'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3167'>
+      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3192'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3168'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3193'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-392' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2161'/>
+          <typedef-decl name='type' type-id='type-id-405' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2176'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3169'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3194'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3170'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3195'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3171'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3196'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackState *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3172'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackState *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3197'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2605' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2651'/>
+          <typedef-decl name='type' type-id='type-id-2626' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2673'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3173'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3198'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventState *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3174'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventState *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3199'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2609' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2653'/>
+          <typedef-decl name='type' type-id='type-id-2630' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2675'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2830' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3175'/>
+          <typedef-decl name='type' type-id='type-id-2855' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3200'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3176'>
+      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3201'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2164'/>
+          <typedef-decl name='type' type-id='type-id-1511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2179'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3177'>
+      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3202'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3178'>
+      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3203'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-445' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2166'/>
+          <typedef-decl name='type' type-id='type-id-457' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2181'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3179'>
+      <class-decl name='remove_reference&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3204'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3180'>
+      <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3205'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2622' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2655'/>
+          <typedef-decl name='type' type-id='type-id-2642' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2677'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3181'>
+      <class-decl name='remove_reference&lt;mongo::repl::StorageInterface *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3206'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2622' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2657'/>
+          <typedef-decl name='type' type-id='type-id-2642' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2679'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;nullptr_t &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3182'/>
-      <class-decl name='remove_reference&lt;nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3183'/>
-      <class-decl name='remove_reference&lt;std::_Any_data &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3184'>
+      <class-decl name='remove_reference&lt;nullptr_t &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3207'/>
+      <class-decl name='remove_reference&lt;nullptr_t&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3208'/>
+      <class-decl name='remove_reference&lt;std::_Any_data &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3209'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-458' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2169'/>
+          <typedef-decl name='type' type-id='type-id-470' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2184'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3185'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3210'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3186'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3211'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3187'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3212'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3188'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3213'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3189'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3214'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3190'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3215'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3191'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3216'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3192'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3217'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3193'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3218'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3194'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3219'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3195'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3220'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3196'>
+      <class-decl name='remove_reference&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3221'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-645' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2192'/>
+          <typedef-decl name='type' type-id='type-id-657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2207'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3197'>
+      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3222'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-665' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2194'/>
+          <typedef-decl name='type' type-id='type-id-677' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2209'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3198'>
+      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3223'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-668' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2196'/>
+          <typedef-decl name='type' type-id='type-id-680' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2211'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3199'>
+      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3224'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-671' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2198'/>
+          <typedef-decl name='type' type-id='type-id-683' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2213'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3200'>
+      <class-decl name='remove_reference&lt;std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3225'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-674' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2200'/>
+          <typedef-decl name='type' type-id='type-id-686' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2215'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Placeholder&lt;2&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3201'>
+      <class-decl name='remove_reference&lt;std::_Placeholder&lt;2&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3226'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-677' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2202'/>
+          <typedef-decl name='type' type-id='type-id-689' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2217'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::Status&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3202'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::Status&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3227'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-791' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2204'/>
+          <typedef-decl name='type' type-id='type-id-803' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2219'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3203'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3228'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-794' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2206'/>
+          <typedef-decl name='type' type-id='type-id-806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2221'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3204'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3229'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-800' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2208'/>
+          <typedef-decl name='type' type-id='type-id-812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2223'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3205'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3230'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-806' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2210'/>
+          <typedef-decl name='type' type-id='type-id-818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2225'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3206'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3231'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-827' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2212'/>
+          <typedef-decl name='type' type-id='type-id-839' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2227'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3207'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3232'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-833' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2214'/>
+          <typedef-decl name='type' type-id='type-id-845' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2229'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3208'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3233'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1852' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2216'/>
+          <typedef-decl name='type' type-id='type-id-1865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2231'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3209'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3234'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-842' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2218'/>
+          <typedef-decl name='type' type-id='type-id-854' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2233'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3210'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3235'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-848' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2220'/>
+          <typedef-decl name='type' type-id='type-id-860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2235'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3211'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3236'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-854' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2222'/>
+          <typedef-decl name='type' type-id='type-id-866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2237'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3212'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3237'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2224'/>
+          <typedef-decl name='type' type-id='type-id-872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2239'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3213'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3238'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-866' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2226'/>
+          <typedef-decl name='type' type-id='type-id-878' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2241'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3214'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3239'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1875' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2228'/>
+          <typedef-decl name='type' type-id='type-id-1888' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2243'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3215'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3240'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2230'/>
+          <typedef-decl name='type' type-id='type-id-884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2245'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3216'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3241'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-878' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2232'/>
+          <typedef-decl name='type' type-id='type-id-890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2247'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3217'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3242'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2234'/>
+          <typedef-decl name='type' type-id='type-id-896' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2249'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3218'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3243'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-890' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2236'/>
+          <typedef-decl name='type' type-id='type-id-902' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2251'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3219'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;3&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3244'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1894' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2238'/>
+          <typedef-decl name='type' type-id='type-id-1907' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2253'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3220'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3245'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-896' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2240'/>
+          <typedef-decl name='type' type-id='type-id-908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2255'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3221'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3246'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-902' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2242'/>
+          <typedef-decl name='type' type-id='type-id-914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2257'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3222'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3247'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2244'/>
+          <typedef-decl name='type' type-id='type-id-920' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2259'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3223'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;4&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3248'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1909' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2246'/>
+          <typedef-decl name='type' type-id='type-id-1922' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2261'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3224'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3249'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2248'/>
+          <typedef-decl name='type' type-id='type-id-926' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2263'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3225'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3250'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-917' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2250'/>
+          <typedef-decl name='type' type-id='type-id-929' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2265'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3226'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;5, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3251'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-920' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2252'/>
+          <typedef-decl name='type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2267'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;6&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3227'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;6&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3252'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1922' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2254'/>
+          <typedef-decl name='type' type-id='type-id-1935' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2269'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3228'>
+      <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3253'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1016' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2256'/>
+          <typedef-decl name='type' type-id='type-id-1028' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2271'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3229'>
+      <class-decl name='remove_reference&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3254'>
+        <member-type access='public'>
+          <typedef-decl name='type' type-id='type-id-1032' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2273'/>
+        </member-type>
+      </class-decl>
+      <class-decl name='remove_reference&lt;std::basic_string&lt;char&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3255'>
+        <member-type access='public'>
+          <typedef-decl name='type' type-id='type-id-2570' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2681'/>
+        </member-type>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1020' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2258'/>
+          <typedef-decl name='type' type-id='type-id-3257' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3256'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::basic_string&lt;char&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3230'>
+      <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3258'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2549' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2659'/>
+          <typedef-decl name='type' type-id='type-id-1117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2275'/>
         </member-type>
+      </class-decl>
+      <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3259'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3232' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3231'/>
+          <typedef-decl name='type' type-id='type-id-1121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2278'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3233'>
+      <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3260'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1105' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2260'/>
+          <typedef-decl name='type' type-id='type-id-1125' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2281'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3234'>
+      <class-decl name='remove_reference&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3261'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1109' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2263'/>
+          <typedef-decl name='type' type-id='type-id-1129' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2283'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3235'>
+      <class-decl name='remove_reference&lt;std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3262'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1113' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2266'/>
+          <typedef-decl name='type' type-id='type-id-1145' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2286'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3236'>
+      <class-decl name='remove_reference&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3263'>
+      </class-decl>
+      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3264'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1117' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2268'/>
+          <typedef-decl name='type' type-id='type-id-1153' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2288'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::function&lt;void ()&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3237'>
+      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3265'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1133' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2271'/>
+          <typedef-decl name='type' type-id='type-id-1157' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2290'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::function&lt;void ()&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3238'>
+      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3266'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3239'>
+      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3267'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1141' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2273'/>
+          <typedef-decl name='type' type-id='type-id-1181' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2292'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3240'>
+      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3268'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1145' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2275'/>
+          <typedef-decl name='type' type-id='type-id-2100' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2294'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3241'>
+      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3269'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3242'>
+      <class-decl name='remove_reference&lt;std::lock_guard&lt;std::mutex&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3270'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1169' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2277'/>
+          <typedef-decl name='type' type-id='type-id-2109' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2296'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3243'>
+      <class-decl name='remove_reference&lt;std::mutex *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3271'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2087' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2279'/>
+          <typedef-decl name='type' type-id='type-id-2114' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2298'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3244'>
+      <class-decl name='remove_reference&lt;std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3272'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::lock_guard&lt;std::mutex&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3245'>
+      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3273'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2096' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2281'/>
+          <typedef-decl name='type' type-id='type-id-1207' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2300'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::mutex *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3246'>
+      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::EventState&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3274'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2101' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2283'/>
+          <typedef-decl name='type' type-id='type-id-1210' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2302'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::mutex *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3247'>
-      </class-decl>
-      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3248'>
+      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3275'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1195' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2285'/>
+          <typedef-decl name='type' type-id='type-id-1213' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2304'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::EventState&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3249'>
+      <class-decl name='remove_reference&lt;std::thread::id &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3276'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1198' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2287'/>
+          <typedef-decl name='type' type-id='type-id-2373' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2306'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3250'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::OperationContext *, mongo::Status&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3277'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1201' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2289'/>
+          <typedef-decl name='type' type-id='type-id-1243' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2308'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::thread::id &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3251'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3278'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2354' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2291'/>
+          <typedef-decl name='type' type-id='type-id-1249' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2310'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::OperationContext *, mongo::Status&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3252'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3279'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1231' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2293'/>
+          <typedef-decl name='type' type-id='type-id-1252' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2312'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3253'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3280'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1237' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2295'/>
+          <typedef-decl name='type' type-id='type-id-1255' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2314'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3254'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3281'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2297'/>
+          <typedef-decl name='type' type-id='type-id-1258' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2316'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3255'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::StorageInterface *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3282'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1243' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2299'/>
+          <typedef-decl name='type' type-id='type-id-1264' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2318'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3256'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3283'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1246' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2301'/>
+          <typedef-decl name='type' type-id='type-id-1267' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2320'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::StorageInterface *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3257'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3284'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1252' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2303'/>
+          <typedef-decl name='type' type-id='type-id-1270' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2322'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3258'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::function&lt;void ()&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3285'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1255' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2305'/>
+          <typedef-decl name='type' type-id='type-id-1276' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2324'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3259'>
+      <class-decl name='remove_reference&lt;unsigned long &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3286'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1258' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2307'/>
+          <typedef-decl name='type' type-id='type-id-96' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2326'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::function&lt;void ()&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3260'>
+      <class-decl name='remove_reference&lt;unsigned long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3287'>
+      </class-decl>
+      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3288'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1264' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2309'/>
+          <typedef-decl name='type' type-id='type-id-2469' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2328'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;unsigned long &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3261'>
+      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3289'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-91' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2311'/>
+          <typedef-decl name='type' type-id='type-id-2475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2330'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;unsigned long&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3262'>
-      </class-decl>
-      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3263'>
+      <class-decl name='remove_reference&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3290'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2450' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2313'/>
+          <typedef-decl name='type' type-id='type-id-2492' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2332'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3264'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3291'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2456' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2315'/>
+          <typedef-decl name='type' type-id='type-id-2470' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2334'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3265'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3292'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2317'/>
+          <typedef-decl name='type' type-id='type-id-2476' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2336'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3266'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3293'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2451' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2319'/>
+          <typedef-decl name='type' type-id='type-id-2482' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2338'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3267'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3294'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2457' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2321'/>
+          <typedef-decl name='type' type-id='type-id-2487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2340'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3268'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3295'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2463' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2323'/>
+          <typedef-decl name='type' type-id='type-id-2490' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2342'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3269'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3296'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2468' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2325'/>
+          <typedef-decl name='type' type-id='type-id-2493' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2344'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3270'>
+      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3297'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2327'/>
+          <typedef-decl name='type' type-id='type-id-119' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2346'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3271'>
+      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3298'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2474' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-2329'/>
+          <typedef-decl name='type' type-id='type-id-121' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-2348'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3272'/>
-      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3273'/>
-      <class-decl name='try_to_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='357' column='1' id='type-id-2882'/>
-      <class-decl name='tuple_element&lt;1, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='97' column='1' id='type-id-3274'>
+      <class-decl name='try_to_lock_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/mutex' line='357' column='1' id='type-id-2907'/>
+      <class-decl name='tuple_element&lt;1, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='97' column='1' id='type-id-3299'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1485' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='98' column='1' id='type-id-3275'/>
+          <typedef-decl name='type' type-id='type-id-1498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/utility' line='98' column='1' id='type-id-3300'/>
         </member-type>
       </class-decl>
-      <class-decl name='unary_function&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2952'/>
-      <class-decl name='unary_function&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2953'/>
-      <class-decl name='unary_function&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2954'/>
-      <class-decl name='unary_function&lt;mongo::repl::StorageInterface *, mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2950'/>
-      <typedef-decl name='_Require&lt;__has_construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3076'/>
-      <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3085'/>
-      <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3094'/>
-      <typedef-decl name='_Require&lt;__has_construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3102'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3077'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3086'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3095'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3103'/>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::EventHandle&gt;' type-id='type-id-120' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3276'/>
-      <typedef-decl name='__allocator_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-122' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3277'/>
-      <typedef-decl name='__allocator_base&lt;mongo::repl::ReplicationExecutor::Event&gt;' type-id='type-id-124' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3278'/>
-      <typedef-decl name='__allocator_base&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' type-id='type-id-126' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3279'/>
-      <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' type-id='type-id-128' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3280'/>
-      <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' type-id='type-id-130' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3281'/>
-      <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-132' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3282'/>
-      <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-134' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3283'/>
-      <typedef-decl name='__allocator_base&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' type-id='type-id-136' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3284'/>
-      <typedef-decl name='__allocator_base&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' type-id='type-id-138' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3285'/>
-      <typedef-decl name='__allocator_base&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-140' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3286'/>
-      <typedef-decl name='__umap_hashtable&lt;std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *, std::hash&lt;string&gt;, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' type-id='type-id-498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='47' column='1' id='type-id-2904'/>
-      <typedef-decl name='atomic_uint' type-id='type-id-935' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='142' column='1' id='type-id-3287'/>
-      <typedef-decl name='false_type' type-id='type-id-1153' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='90' column='1' id='type-id-2749'/>
-      <typedef-decl name='memory_order' type-id='type-id-2923' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-3048'/>
-      <typedef-decl name='ptrdiff_t' type-id='type-id-42' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-3123'/>
-      <typedef-decl name='size_t' type-id='type-id-91' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-92'/>
-      <typedef-decl name='true_type' type-id='type-id-1156' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='87' column='1' id='type-id-3288'/>
-      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1764' column='1' id='type-id-458'>
+      <class-decl name='unary_function&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2977'/>
+      <class-decl name='unary_function&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2978'/>
+      <class-decl name='unary_function&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2979'/>
+      <class-decl name='unary_function&lt;mongo::repl::StorageInterface *, mongo::OperationContext *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='105' column='1' id='type-id-2975'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3101'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3110'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;, const std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3119'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3127'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3102'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3111'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3120'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3128'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::EventHandle&gt;' type-id='type-id-133' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3301'/>
+      <typedef-decl name='__allocator_base&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' type-id='type-id-135' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3302'/>
+      <typedef-decl name='__allocator_base&lt;mongo::repl::ReplicationExecutor::Event&gt;' type-id='type-id-137' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3303'/>
+      <typedef-decl name='__allocator_base&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' type-id='type-id-139' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3304'/>
+      <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' type-id='type-id-141' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3305'/>
+      <typedef-decl name='__allocator_base&lt;std::_List_node&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' type-id='type-id-143' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3306'/>
+      <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-145' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3307'/>
+      <typedef-decl name='__allocator_base&lt;std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-147' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3308'/>
+      <typedef-decl name='__allocator_base&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;' type-id='type-id-149' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3309'/>
+      <typedef-decl name='__allocator_base&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' type-id='type-id-151' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3310'/>
+      <typedef-decl name='__allocator_base&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' type-id='type-id-153' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3311'/>
+      <typedef-decl name='__umap_hashtable&lt;std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *, std::hash&lt;string&gt;, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt;' type-id='type-id-510' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/unordered_map.h' line='47' column='1' id='type-id-2929'/>
+      <typedef-decl name='atomic_uint' type-id='type-id-947' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='142' column='1' id='type-id-3312'/>
+      <typedef-decl name='false_type' type-id='type-id-1165' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='90' column='1' id='type-id-2771'/>
+      <typedef-decl name='memory_order' type-id='type-id-2948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/atomic_base.h' line='64' column='1' id='type-id-3073'/>
+      <typedef-decl name='ptrdiff_t' type-id='type-id-44' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='189' column='1' id='type-id-3148'/>
+      <typedef-decl name='size_t' type-id='type-id-96' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++config.h' line='188' column='1' id='type-id-97'/>
+      <typedef-decl name='true_type' type-id='type-id-1168' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='87' column='1' id='type-id-3313'/>
+      <union-decl name='_Any_data' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1764' column='1' id='type-id-470'>
         <data-member access='public'>
-          <var-decl name='_M_unused' type-id='type-id-3289' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1779' column='1'/>
+          <var-decl name='_M_unused' type-id='type-id-3314' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1779' column='1'/>
         </data-member>
         <data-member access='public'>
           <var-decl name='_M_pod_data' type-id='type-id-11' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1780' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_access&lt;const std::type_info *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPKSt9type_infoEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-2560'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-2581'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access' mangled-name='_ZNKSt9_Any_data9_M_accessEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessEv'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access' mangled-name='_ZNSt9_Any_data9_M_accessEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessEv'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1530'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1543'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_SM_EES7_S8_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1529'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1542'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1524'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1537'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFS1_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS3_16OperationContextERKNS3_6StatusERKNS3_8executor12TaskExecutor14CallbackHandleEPSt4listINS5_8WorkItemESaISH_EEPSt5mutexEEPS5_St12_PlaceholderILi1EESR_ILi2EESD_SK_DnEES7_S8_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1523'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1536'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1542'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1555'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS3_8executor20RemoteCommandRequestERKNS3_10StatusWithINS6_21RemoteCommandResponseEEERKNS6_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSF_25RemoteCommandCallbackArgsEEEEEPS5_S7_St12_PlaceholderILi1EESG_mSO_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1541'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1554'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1560'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1573'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestEESt12_PlaceholderILi1EESD_SG_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1559'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1572'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1566'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1579'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEERKNS3_20RemoteCommandRequestERKNS2_10StatusWithINS3_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESD_SG_SL_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1565'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1578'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1554'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1567'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES6_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1553'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1566'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1536'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1549'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS3_16OperationContextEvEEPS5_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1535'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1548'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1572'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1585'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKSt8functionIFvvEEES4_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-1571'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-1584'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-3290'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-3315'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS2_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-3291'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-3316'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; *&gt;' mangled-name='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERT_v'>
-            <parameter type-id='type-id-1518' name='this' is-artificial='yes'/>
-            <return type-id='type-id-3292'/>
+            <parameter type-id='type-id-1531' name='this' is-artificial='yes'/>
+            <return type-id='type-id-3317'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_access&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; *&gt;' mangled-name='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERKT_v' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9_Any_data9_M_accessIPSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS2_4repl19ScatterGatherRunnerEPNS2_10StatusWithINS4_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEEERKT_v'>
-            <parameter type-id='type-id-461' name='this' is-artificial='yes'/>
-            <return type-id='type-id-3293'/>
+            <parameter type-id='type-id-473' name='this' is-artificial='yes'/>
+            <return type-id='type-id-3318'/>
           </function-decl>
         </member-function>
       </union-decl>
-      <union-decl name='_Nocopy_types' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1756' column='1' id='type-id-3289'>
+      <union-decl name='_Nocopy_types' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1756' column='1' id='type-id-3314'>
         <data-member access='public'>
-          <var-decl name='_M_object' type-id='type-id-52' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1758' column='1'/>
+          <var-decl name='_M_object' type-id='type-id-57' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1758' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_M_const_object' type-id='type-id-52' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1759' column='1'/>
+          <var-decl name='_M_const_object' type-id='type-id-57' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1759' column='1'/>
         </data-member>
         <data-member access='public'>
-          <var-decl name='_M_function_pointer' type-id='type-id-2480' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1760' column='1'/>
+          <var-decl name='_M_function_pointer' type-id='type-id-2499' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1760' column='1'/>
+        </data-member>
+        <data-member access='public'>
+          <var-decl name='_M_member_pointer' type-id='type-id-124' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1761' column='1'/>
         </data-member>
       </union-decl>
-      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2534'/>
-      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2537'/>
-      <class-decl name='__weak_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2540'/>
-      <class-decl name='__weak_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2543'/>
-      <class-decl name='__weak_ptr&lt;std::thread::_Impl_base, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2546'/>
-      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3294'/>
-      <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2632'/>
-      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2549'/>
-      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::EventHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-2868'/>
-      <class-decl name='initializer_list&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' visibility='default' is-declaration-only='yes' id='type-id-2921'/>
-      <class-decl name='initializer_list&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' visibility='default' is-declaration-only='yes' id='type-id-2876'/>
-      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2792'/>
-      <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-2639'/>
-      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2641'/>
-      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3295'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2920'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2914'/>
-      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2865'/>
-      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2873'/>
-      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2867'/>
-      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2875'/>
-      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3296'/>
-      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2661'/>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-2555'>
+      <class-decl name='_Undefined_class' visibility='default' is-declaration-only='yes' id='type-id-123'/>
+      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2555'/>
+      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2558'/>
+      <class-decl name='__weak_ptr&lt;mongo::repl::ReplicationExecutor::Event, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2561'/>
+      <class-decl name='__weak_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2564'/>
+      <class-decl name='__weak_ptr&lt;std::thread::_Impl_base, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-2567'/>
+      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3319'/>
+      <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2654'/>
+      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2570'/>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::EventHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-2893'/>
+      <class-decl name='initializer_list&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;' visibility='default' is-declaration-only='yes' id='type-id-2946'/>
+      <class-decl name='initializer_list&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' visibility='default' is-declaration-only='yes' id='type-id-2901'/>
+      <class-decl name='initializer_list&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2814'/>
+      <class-decl name='ios_base' visibility='default' is-declaration-only='yes' id='type-id-2661'/>
+      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2663'/>
+      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3320'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; **, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2945'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *const *, std::vector&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *, std::allocator&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2939'/>
+      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2890'/>
+      <class-decl name='reverse_iterator&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2898'/>
+      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2892'/>
+      <class-decl name='reverse_iterator&lt;std::_List_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2900'/>
+      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3321'/>
+      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2683'/>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-2576'>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt9type_infoeqERKS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/typeinfo' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9type_infoeqERKS_'>
-            <parameter type-id='type-id-2559' is-artificial='yes'/>
-            <parameter type-id='type-id-2557'/>
+            <parameter type-id='type-id-2580' is-artificial='yes'/>
+            <parameter type-id='type-id-2578'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='unique_ptr&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;, std::default_delete&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3297'/>
-      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2665'/>
-      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' visibility='default' is-declaration-only='yes' id='type-id-2567'/>
-      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' visibility='default' is-declaration-only='yes' id='type-id-2570'/>
-      <class-decl name='weak_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt;' visibility='default' is-declaration-only='yes' id='type-id-2573'/>
-      <class-decl name='weak_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2576'/>
-      <class-decl name='weak_ptr&lt;std::thread::_Impl_base&gt;' visibility='default' is-declaration-only='yes' id='type-id-2579'/>
-      <class-decl name='pair&lt;std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3298'/>
-      <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3113'/>
-      <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3299'/>
+      <class-decl name='unique_ptr&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt;, std::default_delete&lt;mongo::logger::Appender&lt;mongo::logger::MessageEventEphemeral&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3322'/>
+      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2687'/>
+      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' visibility='default' is-declaration-only='yes' id='type-id-2588'/>
+      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' visibility='default' is-declaration-only='yes' id='type-id-2591'/>
+      <class-decl name='weak_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt;' visibility='default' is-declaration-only='yes' id='type-id-2594'/>
+      <class-decl name='weak_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;(lambda at src/mongo/db/repl/replication_executor.cpp:125:36) ()&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-2597'/>
+      <class-decl name='weak_ptr&lt;std::thread::_Impl_base&gt;' visibility='default' is-declaration-only='yes' id='type-id-2600'/>
+      <class-decl name='pair&lt;std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, std::__detail::_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3323'/>
+      <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, bool&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3138'/>
+      <class-decl name='pair&lt;std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;, std::__detail::_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3324'/>
       <function-decl name='operator|' mangled-name='_ZStorSt13_Ios_OpenmodeS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStorSt13_Ios_OpenmodeS_'>
-        <parameter type-id='type-id-2922' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='119' column='1'/>
-        <parameter type-id='type-id-2922' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='119' column='1'/>
-        <return type-id='type-id-2922'/>
+        <parameter type-id='type-id-2947' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='119' column='1'/>
+        <parameter type-id='type-id-2947' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ios_base.h' line='119' column='1'/>
+        <return type-id='type-id-2947'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZSt11__addressofIN5mongo4repl19ReplicationExecutor8WorkItemEEPT_RS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo4repl19ReplicationExecutor8WorkItemEEPT_RS4_'>
-        <parameter type-id='type-id-1507' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1509'/>
+        <parameter type-id='type-id-1520' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1522'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::Status &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo6StatusEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo6StatusEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2122' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-356'/>
+        <parameter type-id='type-id-2135' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-369'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS7_E4typeE'>
-        <parameter type-id='type-id-2124' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-360'/>
+        <parameter type-id='type-id-2137' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-373'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2126' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-386'/>
+        <parameter type-id='type-id-2139' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-399'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2128' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-394'/>
+        <parameter type-id='type-id-2141' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-407'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2130' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-400'/>
+        <parameter type-id='type-id-2143' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-413'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2132' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-408'/>
+        <parameter type-id='type-id-2145' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-421'/>
       </function-decl>
       <function-decl name='forward&lt;const mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' mangled-name='_ZSt7forwardIRKN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2134' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-447'/>
+        <parameter type-id='type-id-2147' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-459'/>
       </function-decl>
       <function-decl name='forward&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEEOT_RNSt16remove_referenceISX_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEEOT_RNSt16remove_referenceISX_E4typeE'>
-        <parameter type-id='type-id-2136' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-476'/>
+        <parameter type-id='type-id-2149' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-488'/>
       </function-decl>
       <function-decl name='forward&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEEOT_RNSt16remove_referenceISX_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEEOT_RNSt16remove_referenceISX_E4typeE'>
-        <parameter type-id='type-id-2138' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-479'/>
+        <parameter type-id='type-id-2151' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-491'/>
       </function-decl>
       <function-decl name='forward&lt;const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt12_PlaceholderILi1EEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt12_PlaceholderILi1EEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2140' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-676'/>
+        <parameter type-id='type-id-2153' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-688'/>
       </function-decl>
       <function-decl name='forward&lt;const std::_Placeholder&lt;2&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt12_PlaceholderILi2EEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt12_PlaceholderILi2EEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2142' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-679'/>
+        <parameter type-id='type-id-2155' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-691'/>
       </function-decl>
       <function-decl name='forward&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &gt;' mangled-name='_ZSt7forwardIKSaIN5mongo4repl19ReplicationExecutor5EventEEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIKSaIN5mongo4repl19ReplicationExecutor5EventEEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2145' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1049'/>
+        <parameter type-id='type-id-2158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1061'/>
       </function-decl>
       <function-decl name='forward&lt;const std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt8functionIFvvEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt8functionIFvvEEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2147' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1135'/>
+        <parameter type-id='type-id-2160' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1147'/>
       </function-decl>
       <function-decl name='forward&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEOT_RNSt16remove_referenceISB_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEOT_RNSt16remove_referenceISB_E4typeE'>
-        <parameter type-id='type-id-2149' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1143'/>
+        <parameter type-id='type-id-2162' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1155'/>
       </function-decl>
       <function-decl name='forward&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceISB_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRKSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceISB_E4typeE'>
-        <parameter type-id='type-id-2151' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1147'/>
+        <parameter type-id='type-id-2164' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1159'/>
+      </function-decl>
+      <function-decl name='forward&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE'>
+        <parameter type-id='type-id-2166' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1446'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::OperationContext *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo16OperationContextEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo16OperationContextEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2646' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2593'/>
+        <parameter type-id='type-id-2668' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2614'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::OperationContext *&gt;' mangled-name='_ZSt7forwardIPN5mongo16OperationContextEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo16OperationContextEEOT_RNSt16remove_referenceIS3_E4typeE'>
-        <parameter type-id='type-id-2648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2594'/>
+        <parameter type-id='type-id-2670' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2615'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::Status &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo6StatusEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo6StatusEEOT_RNSt16remove_referenceIS3_E4typeE'>
-        <parameter type-id='type-id-2155' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1442'/>
+        <parameter type-id='type-id-2170' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1455'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::Status&gt;' mangled-name='_ZSt7forwardIN5mongo6StatusEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo6StatusEEOT_RNSt16remove_referenceIS2_E4typeE'>
-        <parameter type-id='type-id-2155' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1443'/>
+        <parameter type-id='type-id-2170' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1456'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS6_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS6_E4typeE'>
-        <parameter type-id='type-id-2158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1447'/>
+        <parameter type-id='type-id-2173' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1460'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt7forwardIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1448'/>
+        <parameter type-id='type-id-2173' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1461'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::NetworkInterface *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo8executor16NetworkInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo8executor16NetworkInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2650' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2600'/>
+        <parameter type-id='type-id-2672' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2621'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2160' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1462'/>
+        <parameter type-id='type-id-2175' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1475'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt7forwardIN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor20RemoteCommandRequestEEOT_RNSt16remove_referenceIS3_E4typeE'>
-        <parameter type-id='type-id-2160' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1463'/>
+        <parameter type-id='type-id-2175' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1476'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2162' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1468'/>
+        <parameter type-id='type-id-2177' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1481'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt7forwardIN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor12TaskExecutor12CallbackArgsEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2162' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1469'/>
+        <parameter type-id='type-id-2177' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1482'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt7forwardIRN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2163' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1471'/>
+        <parameter type-id='type-id-2178' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1484'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt7forwardIN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo8executor12TaskExecutor14CallbackHandleEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2163' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1472'/>
+        <parameter type-id='type-id-2178' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1485'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2165' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1501'/>
+        <parameter type-id='type-id-2180' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1514'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZSt7forwardIPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo4repl19ReplicationExecutorEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2165' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1502'/>
+        <parameter type-id='type-id-2180' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1515'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ReplicationExecutor::WorkItem&gt;' mangled-name='_ZSt7forwardIN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIN5mongo4repl19ReplicationExecutor8WorkItemEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2168' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1508'/>
+        <parameter type-id='type-id-2183' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1521'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2656' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2625'/>
+        <parameter type-id='type-id-2678' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2646'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::StorageInterface *&gt;' mangled-name='_ZSt7forwardIPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo4repl16StorageInterfaceEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2658' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2626'/>
+        <parameter type-id='type-id-2680' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2647'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &gt;' mangled-name='_ZSt7forwardISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestERKNS1_10StatusWithINS2_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESC_SF_SK_EEEOT_RNSt16remove_referenceIST_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestERKNS1_10StatusWithINS2_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESC_SF_SK_EEEOT_RNSt16remove_referenceIST_E4typeE'>
-        <parameter type-id='type-id-2189' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1562'/>
+        <parameter type-id='type-id-2204' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1575'/>
       </function-decl>
       <function-decl name='forward&lt;std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSt14_List_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEEOT_RNSt16remove_referenceIS7_E4typeE'>
-        <parameter type-id='type-id-2193' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1703'/>
+        <parameter type-id='type-id-2208' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1716'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt7forwardISt12_PlaceholderILi1EEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt12_PlaceholderILi1EEEOT_RNSt16remove_referenceIS2_E4typeE'>
-        <parameter type-id='type-id-2201' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1722'/>
+        <parameter type-id='type-id-2216' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1735'/>
       </function-decl>
       <function-decl name='forward&lt;std::_Placeholder&lt;2&gt; &gt;' mangled-name='_ZSt7forwardISt12_PlaceholderILi2EEEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt12_PlaceholderILi2EEEOT_RNSt16remove_referenceIS2_E4typeE'>
-        <parameter type-id='type-id-2203' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-1724'/>
+        <parameter type-id='type-id-2218' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-1737'/>
       </function-decl>
       <function-decl name='forward&lt;std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt7forwardISt14default_deleteIN5mongo8executor16NetworkInterfaceEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt14default_deleteIN5mongo8executor16NetworkInterfaceEEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2261' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2047'/>
+        <parameter type-id='type-id-2276' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2060'/>
       </function-decl>
       <function-decl name='forward&lt;std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt7forwardISt14default_deleteIN5mongo4repl16StorageInterfaceEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt14default_deleteIN5mongo4repl16StorageInterfaceEEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2264' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2050'/>
+        <parameter type-id='type-id-2279' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2063'/>
       </function-decl>
       <function-decl name='forward&lt;std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt7forwardISt14default_deleteISt10lock_guardISt5mutexEEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt14default_deleteISt10lock_guardISt5mutexEEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2269' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2055'/>
+        <parameter type-id='type-id-2284' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2068'/>
       </function-decl>
       <function-decl name='forward&lt;std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRSt8functionIFvvEEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSt8functionIFvvEEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-2272' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2064'/>
+        <parameter type-id='type-id-2287' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2077'/>
       </function-decl>
       <function-decl name='forward&lt;std::function&lt;void ()&gt; &gt;' mangled-name='_ZSt7forwardISt8functionIFvvEEEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt8functionIFvvEEEOT_RNSt16remove_referenceIS3_E4typeE'>
-        <parameter type-id='type-id-2272' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2065'/>
+        <parameter type-id='type-id-2287' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2078'/>
       </function-decl>
       <function-decl name='forward&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt7forwardIRSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceISA_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceISA_E4typeE'>
-        <parameter type-id='type-id-2276' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2073'/>
+        <parameter type-id='type-id-2291' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2086'/>
       </function-decl>
       <function-decl name='forward&lt;std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt7forwardISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceIS9_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardISt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEOT_RNSt16remove_referenceIS9_E4typeE'>
-        <parameter type-id='type-id-2276' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2074'/>
+        <parameter type-id='type-id-2291' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2087'/>
       </function-decl>
       <function-decl name='forward&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&amp;&gt;' mangled-name='_ZSt7forwardIRPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEOT_RNSt16remove_referenceIS9_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEOT_RNSt16remove_referenceIS9_E4typeE'>
-        <parameter type-id='type-id-2280' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2090'/>
+        <parameter type-id='type-id-2295' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2103'/>
       </function-decl>
       <function-decl name='forward&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *&gt;' mangled-name='_ZSt7forwardIPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEOT_RNSt16remove_referenceIS8_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEOT_RNSt16remove_referenceIS8_E4typeE'>
-        <parameter type-id='type-id-2280' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2091'/>
+        <parameter type-id='type-id-2295' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2104'/>
       </function-decl>
       <function-decl name='forward&lt;std::lock_guard&lt;std::mutex&gt; *&amp;&gt;' mangled-name='_ZSt7forwardIRPSt10lock_guardISt5mutexEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt10lock_guardISt5mutexEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-2282' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2099'/>
+        <parameter type-id='type-id-2297' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2112'/>
       </function-decl>
       <function-decl name='forward&lt;std::mutex *&amp;&gt;' mangled-name='_ZSt7forwardIRPSt5mutexEOT_RNSt16remove_referenceIS3_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPSt5mutexEOT_RNSt16remove_referenceIS3_E4typeE'>
-        <parameter type-id='type-id-2284' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2104'/>
+        <parameter type-id='type-id-2299' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2117'/>
       </function-decl>
       <function-decl name='forward&lt;std::mutex *&gt;' mangled-name='_ZSt7forwardIPSt5mutexEOT_RNSt16remove_referenceIS2_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPSt5mutexEOT_RNSt16remove_referenceIS2_E4typeE'>
-        <parameter type-id='type-id-2284' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2105'/>
+        <parameter type-id='type-id-2299' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2118'/>
       </function-decl>
       <function-decl name='forward&lt;unsigned long &amp;&gt;' mangled-name='_ZSt7forwardIRmEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRmEOT_RNSt16remove_referenceIS1_E4typeE'>
-        <parameter type-id='type-id-2312' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2448'/>
+        <parameter type-id='type-id-2327' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2467'/>
       </function-decl>
       <function-decl name='forward&lt;unsigned long&gt;' mangled-name='_ZSt7forwardImEOT_RNSt16remove_referenceIS0_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardImEOT_RNSt16remove_referenceIS0_E4typeE'>
-        <parameter type-id='type-id-2312' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2449'/>
+        <parameter type-id='type-id-2327' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2468'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEOT_RNSt16remove_referenceISJ_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEOT_RNSt16remove_referenceISJ_E4typeE'>
-        <parameter type-id='type-id-2314' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2481'/>
+        <parameter type-id='type-id-2329' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2500'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEOT_RNSt16remove_referenceISO_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEOT_RNSt16remove_referenceISO_E4typeE'>
-        <parameter type-id='type-id-2316' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2482'/>
+        <parameter type-id='type-id-2331' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2501'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIRFvRKSt8functionIFvvEEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKSt8functionIFvvEEEEOT_RNSt16remove_referenceIS7_E4typeE'>
-        <parameter type-id='type-id-2318' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-2483'/>
+        <parameter type-id='type-id-2333' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2502'/>
       </function-decl>
-      <function-decl name='forward&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEEOT_RNSt16remove_referenceIS7_E4typeE'>
-        <return type-id='type-id-2675'/>
+      <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEOT_RNSt16remove_referenceISQ_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEOT_RNSt16remove_referenceISQ_E4typeE'>
+        <parameter type-id='type-id-2347' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2503'/>
+      </function-decl>
+      <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEOT_RNSt16remove_referenceISM_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEOT_RNSt16remove_referenceISM_E4typeE'>
+        <parameter type-id='type-id-2349' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-2504'/>
       </function-decl>
       <function-decl name='forward&lt;nullptr_t &amp;&gt;' mangled-name='_ZSt7forwardIRDnEOT_RNSt16remove_referenceIS1_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRDnEOT_RNSt16remove_referenceIS1_E4typeE'>
-        <return type-id='type-id-2675'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='forward&lt;nullptr_t&gt;' mangled-name='_ZSt7forwardIDnEOT_RNSt16remove_referenceIS0_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIDnEOT_RNSt16remove_referenceIS0_E4typeE'>
-        <return type-id='type-id-2675'/>
-      </function-decl>
-      <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEOT_RNSt16remove_referenceISQ_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEEOT_RNSt16remove_referenceISQ_E4typeE'>
-        <return type-id='type-id-2675'/>
-      </function-decl>
-      <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEOT_RNSt16remove_referenceISM_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEEOT_RNSt16remove_referenceISM_E4typeE'>
-        <return type-id='type-id-2675'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='move&lt;bool (*&amp;)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&gt;' mangled-name='_ZSt4moveIRPFbRSt9_Any_dataRKS0_St18_Manager_operationEEONSt16remove_referenceIT_E4typeEOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFbRSt9_Any_dataRKS0_St18_Manager_operationEEONSt16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-145' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2118'/>
+        <parameter type-id='type-id-158' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2131'/>
       </function-decl>
       <function-decl name='move&lt;const char *&amp;&gt;' mangled-name='_ZSt4moveIRPKcEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPKcEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-272' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2120'/>
+        <parameter type-id='type-id-285' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2133'/>
       </function-decl>
       <function-decl name='move&lt;const std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' mangled-name='_ZSt4moveIRKSaIN5mongo4repl19ReplicationExecutor5EventEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRKSaIN5mongo4repl19ReplicationExecutor5EventEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-1048' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2144'/>
+        <parameter type-id='type-id-1060' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2157'/>
       </function-decl>
       <function-decl name='move&lt;mongo::SharedBuffer &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo12SharedBufferEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo12SharedBufferEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1437' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2153'/>
+        <parameter type-id='type-id-1450' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2168'/>
       </function-decl>
       <function-decl name='move&lt;mongo::Status &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo6StatusEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo6StatusEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1442' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2156'/>
+        <parameter type-id='type-id-1455' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2171'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1471' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-189'/>
+        <parameter type-id='type-id-1484' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-202'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackState *&amp;&gt;' mangled-name='_ZSt4moveIRPN5mongo8executor12TaskExecutor13CallbackStateEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPN5mongo8executor12TaskExecutor13CallbackStateEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-2606' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2652'/>
+        <parameter type-id='type-id-2627' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2674'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo8executor12TaskExecutor11EventHandleEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo8executor12TaskExecutor11EventHandleEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1474' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-191'/>
+        <parameter type-id='type-id-1487' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-204'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventState *&amp;&gt;' mangled-name='_ZSt4moveIRPN5mongo8executor12TaskExecutor10EventStateEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPN5mongo8executor12TaskExecutor10EventStateEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-2610' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2654'/>
+        <parameter type-id='type-id-2631' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2676'/>
       </function-decl>
       <function-decl name='move&lt;mongo::repl::ReplicationExecutor::WorkItem &amp;&gt;' mangled-name='_ZSt4moveIRN5mongo4repl19ReplicationExecutor8WorkItemEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRN5mongo4repl19ReplicationExecutor8WorkItemEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1507' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2167'/>
+        <parameter type-id='type-id-1520' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2182'/>
       </function-decl>
       <function-decl name='move&lt;std::_Any_data &amp;&gt;' mangled-name='_ZSt4moveIRSt9_Any_dataEONSt16remove_referenceIT_E4typeEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt9_Any_dataEONSt16remove_referenceIT_E4typeEOS3_'>
-        <parameter type-id='type-id-1517' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2170'/>
+        <parameter type-id='type-id-1530' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2185'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFS0_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEES6_S7_EEEONSt16remove_referenceIT_E4typeEOSZ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFS0_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEES6_S7_EEEONSt16remove_referenceIT_E4typeEOSZ_'>
-        <parameter type-id='type-id-1519' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2172'/>
+        <parameter type-id='type-id-1532' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2187'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::OperationContext *, mongo::Status)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFS0_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EES6_S7_EEEONSt16remove_referenceIT_E4typeEOSZ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFS0_IFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EES6_S7_EEEONSt16remove_referenceIT_E4typeEOSZ_'>
-        <parameter type-id='type-id-1525' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2174'/>
+        <parameter type-id='type-id-1538' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2189'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; (mongo::repl::StorageInterface *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS2_16OperationContextEvEEPS4_EEEONSt16remove_referenceIT_E4typeEOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS2_16OperationContextEvEEPS4_EEEONSt16remove_referenceIT_E4typeEOSF_'>
-        <parameter type-id='type-id-1531' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2176'/>
+        <parameter type-id='type-id-1544' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2191'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; (mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor20RemoteCommandRequestERKNS2_10StatusWithINS5_21RemoteCommandResponseEEERKNS5_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSE_25RemoteCommandCallbackArgsEEEEEPS4_S6_St12_PlaceholderILi1EESF_mSN_EEEONSt16remove_referenceIT_E4typeEOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor20RemoteCommandRequestERKNS2_10StatusWithINS5_21RemoteCommandResponseEEERKNS5_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSE_25RemoteCommandCallbackArgsEEEEEPS4_S6_St12_PlaceholderILi1EESF_mSN_EEEONSt16remove_referenceIT_E4typeEOS10_'>
-        <parameter type-id='type-id-1537' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2178'/>
+        <parameter type-id='type-id-1550' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2193'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEEONSt16remove_referenceIT_E4typeEOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEEONSt16remove_referenceIT_E4typeEOSX_'>
-        <parameter type-id='type-id-1543' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2180'/>
+        <parameter type-id='type-id-1556' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2195'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEEONSt16remove_referenceIT_E4typeEOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEEONSt16remove_referenceIT_E4typeEOSX_'>
-        <parameter type-id='type-id-1546' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2182'/>
+        <parameter type-id='type-id-1559' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2197'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; (mongo::executor::TaskExecutor::CallbackArgs)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES5_EEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEES5_EEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-1549' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2184'/>
+        <parameter type-id='type-id-1562' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2199'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestEESt12_PlaceholderILi1EESC_SF_EEEONSt16remove_referenceIT_E4typeEOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestEESt12_PlaceholderILi1EESC_SF_EEEONSt16remove_referenceIT_E4typeEOSQ_'>
-        <parameter type-id='type-id-1555' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2186'/>
+        <parameter type-id='type-id-1568' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2201'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestERKNS1_10StatusWithINS2_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESC_SF_SK_EEEONSt16remove_referenceIT_E4typeEOSV_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEERKNS2_20RemoteCommandRequestERKNS1_10StatusWithINS2_21RemoteCommandResponseEEEESt12_PlaceholderILi1EESC_SF_SK_EEEONSt16remove_referenceIT_E4typeEOSV_'>
-        <parameter type-id='type-id-1561' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2188'/>
+        <parameter type-id='type-id-1574' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2203'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::function&lt;void ()&gt;))(const std::function&lt;void ()&gt; &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKSt8functionIFvvEEES3_EEEONSt16remove_referenceIT_E4typeEOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFPFvRKSt8functionIFvvEEES3_EEEONSt16remove_referenceIT_E4typeEOSC_'>
-        <parameter type-id='type-id-1567' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2191'/>
+        <parameter type-id='type-id-1580' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2206'/>
       </function-decl>
       <function-decl name='move&lt;std::_Mem_fn&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)()&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEEONSt16remove_referenceIT_E4typeEOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl16StorageInterfaceEFPNS1_16OperationContextEvEEEONSt16remove_referenceIT_E4typeEOSB_'>
-        <parameter type-id='type-id-1712' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2195'/>
+        <parameter type-id='type-id-1725' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2210'/>
       </function-decl>
       <function-decl name='move&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSU_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor20RemoteCommandRequestERKNS1_10StatusWithINS4_21RemoteCommandResponseEEERKNS4_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSD_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSU_'>
-        <parameter type-id='type-id-1715' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2197'/>
+        <parameter type-id='type-id-1728' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2212'/>
       </function-decl>
       <function-decl name='move&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS1_16OperationContextERKNS1_6StatusERKNS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISF_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSQ_'>
-        <parameter type-id='type-id-1718' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2199'/>
+        <parameter type-id='type-id-1731' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2214'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::Status&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJN5mongo6StatusEEEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJN5mongo6StatusEEEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1813' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2205'/>
+        <parameter type-id='type-id-1826' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2220'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS2_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS6_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJN5mongo8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS2_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS6_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-1816' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2207'/>
+        <parameter type-id='type-id-1829' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2222'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES1_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS4_4repl19ReplicationExecutor8WorkItemESaISB_EEDnEEEONSt16remove_referenceIT_E4typeEOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES1_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS4_4repl19ReplicationExecutor8WorkItemESaISB_EEDnEEEONSt16remove_referenceIT_E4typeEOSI_'>
-        <parameter type-id='type-id-1820' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2209'/>
+        <parameter type-id='type-id-1833' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2224'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES1_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS4_4repl19ReplicationExecutor8WorkItemESaISB_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EES1_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS4_4repl19ReplicationExecutor8WorkItemESaISB_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSK_'>
-        <parameter type-id='type-id-1824' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2211'/>
+        <parameter type-id='type-id-1837' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2226'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS3_20RemoteCommandRequestENS2_10StatusWithINS3_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS3_20RemoteCommandRequestENS2_10StatusWithINS3_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-1841' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2213'/>
+        <parameter type-id='type-id-1854' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2228'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS3_20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS3_20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-1845' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2215'/>
+        <parameter type-id='type-id-1858' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2230'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1853' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2217'/>
+        <parameter type-id='type-id-1866' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2232'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-1855' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2219'/>
+        <parameter type-id='type-id-1868' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2234'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJN5mongo8executor20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-1859' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2221'/>
+        <parameter type-id='type-id-1872' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2236'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi1EEN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSG_'>
-        <parameter type-id='type-id-1863' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2223'/>
+        <parameter type-id='type-id-1876' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2238'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-1867' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2225'/>
+        <parameter type-id='type-id-1880' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2240'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSJ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJSt12_PlaceholderILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSJ_'>
-        <parameter type-id='type-id-1871' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2227'/>
+        <parameter type-id='type-id-1884' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2242'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1876' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2229'/>
+        <parameter type-id='type-id-1889' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2244'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo10StatusWithINS1_8executor21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo10StatusWithINS1_8executor21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-1878' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2231'/>
+        <parameter type-id='type-id-1891' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2246'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS1_4repl19ReplicationExecutor8WorkItemESaIS8_EEDnEEEONSt16remove_referenceIT_E4typeEOSF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS1_4repl19ReplicationExecutor8WorkItemESaIS8_EEDnEEEONSt16remove_referenceIT_E4typeEOSF_'>
-        <parameter type-id='type-id-1882' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2233'/>
+        <parameter type-id='type-id-1895' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2248'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS1_4repl19ReplicationExecutor8WorkItemESaIS8_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS1_4repl19ReplicationExecutor8WorkItemESaIS8_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-1886' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2235'/>
+        <parameter type-id='type-id-1899' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2250'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm3EJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS3_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-1890' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2237'/>
+        <parameter type-id='type-id-1903' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2252'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;3&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm3EJEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm3EJEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1895' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2239'/>
+        <parameter type-id='type-id-1908' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2254'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS5_EEDnEEEONSt16remove_referenceIT_E4typeEOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS5_EEDnEEEONSt16remove_referenceIT_E4typeEOSC_'>
-        <parameter type-id='type-id-1897' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2241'/>
+        <parameter type-id='type-id-1910' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2256'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS5_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm4EJPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS5_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-1901' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2243'/>
+        <parameter type-id='type-id-1914' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2258'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm4EJmSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-1905' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2245'/>
+        <parameter type-id='type-id-1918' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2260'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;4&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm4EJEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm4EJEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1910' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2247'/>
+        <parameter type-id='type-id-1923' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2262'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;5, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm5EJDnEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm5EJDnEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1912' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2249'/>
+        <parameter type-id='type-id-1925' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2264'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm5EJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-1915' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2251'/>
+        <parameter type-id='type-id-1928' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2266'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;5, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm5EJPSt5mutexEEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm5EJPSt5mutexEEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1918' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2253'/>
+        <parameter type-id='type-id-1931' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2268'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;6&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm6EJEEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm6EJEEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-1923' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2255'/>
+        <parameter type-id='type-id-1936' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2270'/>
       </function-decl>
       <function-decl name='move&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt12__shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateELN9__gnu_cxx12_Lock_policyE2EEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-1988' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2257'/>
+        <parameter type-id='type-id-2001' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2272'/>
       </function-decl>
       <function-decl name='move&lt;std::__shared_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt12__shared_ptrIN5mongo8executor12TaskExecutor10EventStateELN9__gnu_cxx12_Lock_policyE2EEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-1991' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2259'/>
+        <parameter type-id='type-id-2004' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2274'/>
       </function-decl>
       <function-decl name='move&lt;std::basic_string&lt;char&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSsEONSt16remove_referenceIT_E4typeEOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSsEONSt16remove_referenceIT_E4typeEOS2_'>
-        <parameter type-id='type-id-2638' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2660'/>
+        <parameter type-id='type-id-2660' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2682'/>
       </function-decl>
       <function-decl name='move&lt;std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEONSt16remove_referenceIT_E4typeEOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEEONSt16remove_referenceIT_E4typeEOSB_'>
-        <parameter type-id='type-id-2070' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2274'/>
+        <parameter type-id='type-id-2083' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2289'/>
       </function-decl>
       <function-decl name='move&lt;std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEONSt16remove_referenceIT_E4typeEOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEEONSt16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-2085' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2278'/>
+        <parameter type-id='type-id-2098' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2293'/>
       </function-decl>
       <function-decl name='move&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt10shared_ptrIN5mongo8executor12TaskExecutor13CallbackStateEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2331' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2286'/>
+        <parameter type-id='type-id-2350' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2301'/>
       </function-decl>
       <function-decl name='move&lt;std::shared_ptr&lt;mongo::executor::TaskExecutor::EventState&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt10shared_ptrIN5mongo8executor12TaskExecutor10EventStateEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2334' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2288'/>
+        <parameter type-id='type-id-2353' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2303'/>
       </function-decl>
       <function-decl name='move&lt;std::shared_ptr&lt;mongo::repl::ReplicationExecutor::Event&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt10shared_ptrIN5mongo4repl19ReplicationExecutor5EventEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt10shared_ptrIN5mongo4repl19ReplicationExecutor5EventEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2337' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2290'/>
+        <parameter type-id='type-id-2356' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2305'/>
       </function-decl>
       <function-decl name='move&lt;std::thread::id &amp;&gt;' mangled-name='_ZSt4moveIRNSt6thread2idEEONSt16remove_referenceIT_E4typeEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRNSt6thread2idEEONSt16remove_referenceIT_E4typeEOS4_'>
-        <parameter type-id='type-id-2355' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2292'/>
+        <parameter type-id='type-id-2374' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2307'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::OperationContext *, mongo::Status&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo16OperationContextENS1_6StatusEEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo16OperationContextENS1_6StatusEEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2373' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2294'/>
+        <parameter type-id='type-id-2392' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2309'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::executor::TaskExecutor::CallbackArgs&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJN5mongo8executor12TaskExecutor12CallbackArgsEEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2379' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2296'/>
+        <parameter type-id='type-id-2398' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2311'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorENS1_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS5_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS9_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorENS1_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS5_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS9_25RemoteCommandCallbackArgsEEEEEEONSt16remove_referenceIT_E4typeEOSK_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2298'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2313'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES5_ILi2EENS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISC_EEDnEEEONSt16remove_referenceIT_E4typeEOSJ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES5_ILi2EENS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISC_EEDnEEEONSt16remove_referenceIT_E4typeEOSJ_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2300'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2315'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES5_ILi2EENS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISC_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES5_ILi2EENS1_8executor12TaskExecutor14CallbackHandleEPSt4listINS3_8WorkItemESaISC_EEPSt5mutexEEEONSt16remove_referenceIT_E4typeEOSL_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2302'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2317'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::StorageInterface *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl16StorageInterfaceEEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo4repl16StorageInterfaceEEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-2394' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2304'/>
+        <parameter type-id='type-id-2413' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2319'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS5_20RemoteCommandRequestENS4_10StatusWithINS5_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSJ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS5_20RemoteCommandRequestENS4_10StatusWithINS5_21RemoteCommandResponseEEEEEEONSt16remove_referenceIT_E4typeEOSJ_'>
-        <parameter type-id='type-id-2397' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2306'/>
+        <parameter type-id='type-id-2416' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2321'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS5_20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS5_20RemoteCommandRequestEEEEONSt16remove_referenceIT_E4typeEOSG_'>
-        <parameter type-id='type-id-2400' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2308'/>
+        <parameter type-id='type-id-2419' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2323'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;std::function&lt;void ()&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt8functionIFvvEEEEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJSt8functionIFvvEEEEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-2406' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2310'/>
+        <parameter type-id='type-id-2425' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2325'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEONSt16remove_referenceIT_E4typeEOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEEONSt16remove_referenceIT_E4typeEOSL_'>
-        <parameter type-id='type-id-2454' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2320'/>
+        <parameter type-id='type-id-2473' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2335'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEONSt16remove_referenceIT_E4typeEOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEEONSt16remove_referenceIT_E4typeEOSQ_'>
-        <parameter type-id='type-id-2460' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2322'/>
+        <parameter type-id='type-id-2479' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2337'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataEEONSt16remove_referenceIT_E4typeEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataEEONSt16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-2464' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2324'/>
+        <parameter type-id='type-id-2483' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2339'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-2469' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2326'/>
+        <parameter type-id='type-id-2488' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2341'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-2472' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2328'/>
+        <parameter type-id='type-id-2491' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2343'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const std::function&lt;void ()&gt; &amp;)&gt;' mangled-name='_ZSt4moveIRPFvRKSt8functionIFvvEEEEONSt16remove_referenceIT_E4typeEOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKSt8functionIFvvEEEEONSt16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-2477' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-2330'/>
+        <parameter type-id='type-id-2496' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-2345'/>
       </function-decl>
       <function-decl name='swap&lt;bool (*)(std::_Any_data &amp;, const std::_Any_data &amp;, std::_Manager_operation)&gt;' mangled-name='_ZSt4swapIPFbRSt9_Any_dataRKS0_St18_Manager_operationEEvRT_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFbRSt9_Any_dataRKS0_St18_Manager_operationEEvRT_S8_'>
-        <parameter type-id='type-id-145' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-145' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-158' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-158' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;mongo::executor::TaskExecutor::CallbackState *&gt;' mangled-name='_ZSt4swapIPN5mongo8executor12TaskExecutor13CallbackStateEEvRT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPN5mongo8executor12TaskExecutor13CallbackStateEEvRT_S6_'>
-        <parameter type-id='type-id-2606' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2606' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2627' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2627' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;mongo::executor::TaskExecutor::EventState *&gt;' mangled-name='_ZSt4swapIPN5mongo8executor12TaskExecutor10EventStateEEvRT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPN5mongo8executor12TaskExecutor10EventStateEEvRT_S6_'>
-        <parameter type-id='type-id-2610' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2610' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2631' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2631' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;std::_Any_data&gt;' mangled-name='_ZSt4swapISt9_Any_dataEvRT_S2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapISt9_Any_dataEvRT_S2_'>
-        <parameter type-id='type-id-1517' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-1517' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1530' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-1530' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;std::thread::id&gt;' mangled-name='_ZSt4swapINSt6thread2idEEvRT_S3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapINSt6thread2idEEvRT_S3_'>
-        <parameter type-id='type-id-2355' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2355' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2374' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2374' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataEEvRT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataEEvRT_S6_'>
-        <parameter type-id='type-id-2464' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2464' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2483' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2483' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEvRT_SC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor12CallbackArgsEEEvRT_SC_'>
-        <parameter type-id='type-id-2469' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2469' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2488' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2488' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='swap&lt;void (*)(const std::_Any_data &amp;, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;' mangled-name='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEvRT_SC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4swapIPFvRKSt9_Any_dataRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEvRT_SC_'>
-        <parameter type-id='type-id-2472' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <parameter type-id='type-id-2472' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2491' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <parameter type-id='type-id-2491' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='554' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <namespace-decl name='__detail'>
-        <class-decl name='_Equality&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-939'>
+        <class-decl name='_Equality&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1803' column='1' id='type-id-951'>
         </class-decl>
-        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-945'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-968'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-977'/>
+        <class-decl name='_Hash_code_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1228' column='1' id='type-id-957'>
           <base-class access='private' layout-offset-in-bits='0' type-id='type-id-980'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-989'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-992'/>
           <member-type access='public'>
-            <typedef-decl name='__hash_code' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-3300'/>
+            <typedef-decl name='__hash_code' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-3325'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_type' type-id='type-id-951' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-948'/>
+            <typedef-decl name='__node_type' type-id='type-id-963' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1252' column='1' id='type-id-960'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='hasher' type-id='type-id-1149' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2905'/>
+            <typedef-decl name='hasher' type-id='type-id-1161' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1244' column='1' id='type-id-2930'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='_Hash_code_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1254' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1937' is-artificial='yes'/>
-              <parameter type-id='type-id-1008'/>
-              <parameter type-id='type-id-1151'/>
-              <parameter type-id='type-id-997'/>
-              <parameter type-id='type-id-2530'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1950' is-artificial='yes'/>
+              <parameter type-id='type-id-1020'/>
+              <parameter type-id='type-id-1163'/>
+              <parameter type-id='type-id-1009'/>
+              <parameter type-id='type-id-2551'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-951'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-955'/>
+        <class-decl name='_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt;' size-in-bits='256' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='280' column='1' id='type-id-963'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-967'/>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='_M_hash_code' type-id='type-id-92' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='282' column='1'/>
+            <var-decl name='_M_hash_code' type-id='type-id-97' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='282' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Hash_node_base' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='230' column='1' id='type-id-73'>
+        <class-decl name='_Hash_node_base' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='230' column='1' id='type-id-78'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='_M_nxt' type-id='type-id-1941' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='232' column='1'/>
+            <var-decl name='_M_nxt' type-id='type-id-1954' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='232' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='_Hash_node_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1941' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1954' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='_Hash_node_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1941' is-artificial='yes'/>
-              <parameter type-id='type-id-1941'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1954' is-artificial='yes'/>
+              <parameter type-id='type-id-1954'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-955'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-73'/>
+        <class-decl name='_Hash_node_value_base&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='245' column='1' id='type-id-967'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-78'/>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='_M_storage' type-id='type-id-116' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='249' column='1'/>
+            <var-decl name='_M_storage' type-id='type-id-129' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='249' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-958'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-971'/>
+        <class-decl name='_Hashtable_alloc&lt;std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1889' column='1' id='type-id-970'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-983'/>
           <member-type access='public'>
-            <typedef-decl name='__node_alloc_type' type-id='type-id-1065' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-962'/>
+            <typedef-decl name='__node_alloc_type' type-id='type-id-1077' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1895' column='1' id='type-id-974'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_type' type-id='type-id-2842' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1894' column='1' id='type-id-1946'/>
+            <typedef-decl name='__node_type' type-id='type-id-2867' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1894' column='1' id='type-id-1959'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='_Hashtable_alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1910' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1944' is-artificial='yes'/>
-              <parameter type-id='type-id-960'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1957' is-artificial='yes'/>
+              <parameter type-id='type-id-972'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='_Hashtable_alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1911' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1944' is-artificial='yes'/>
-              <parameter type-id='type-id-1943'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1957' is-artificial='yes'/>
+              <parameter type-id='type-id-1956'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-965'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-974'/>
+        <class-decl name='_Hashtable_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1646' column='1' id='type-id-977'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-957'/>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-986'/>
           <member-type access='public'>
-            <typedef-decl name='__hash_code' type-id='type-id-3300' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2781'/>
+            <typedef-decl name='__hash_code' type-id='type-id-3325' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1667' column='1' id='type-id-2803'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__node_type' type-id='type-id-948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1950'/>
+            <typedef-decl name='__node_type' type-id='type-id-960' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1668' column='1' id='type-id-1963'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='value_type' type-id='type-id-1188' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-3301'/>
+            <typedef-decl name='value_type' type-id='type-id-1200' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1653' column='1' id='type-id-3326'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__ireturn_type' type-id='type-id-3112' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1689' column='1' id='type-id-3302'/>
+            <typedef-decl name='__ireturn_type' type-id='type-id-3137' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1689' column='1' id='type-id-3327'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='const_iterator' type-id='type-id-3303' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1674' column='1' id='type-id-2785'/>
+            <typedef-decl name='const_iterator' type-id='type-id-3328' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1674' column='1' id='type-id-2807'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='const_local_iterator' type-id='type-id-3304' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1683' column='1' id='type-id-2787'/>
+            <typedef-decl name='const_local_iterator' type-id='type-id-3329' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1683' column='1' id='type-id-2809'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='iterator' type-id='type-id-3305' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1670' column='1' id='type-id-2789'/>
+            <typedef-decl name='iterator' type-id='type-id-3330' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1670' column='1' id='type-id-2811'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='key_type' type-id='type-id-2549' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1652' column='1' id='type-id-3306'/>
+            <typedef-decl name='key_type' type-id='type-id-2570' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1652' column='1' id='type-id-3331'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='local_iterator' type-id='type-id-3307' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1678' column='1' id='type-id-2791'/>
+            <typedef-decl name='local_iterator' type-id='type-id-3332' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1678' column='1' id='type-id-2813'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='_Hashtable_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1698' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1949' is-artificial='yes'/>
-              <parameter type-id='type-id-1008'/>
-              <parameter type-id='type-id-1151'/>
-              <parameter type-id='type-id-997'/>
-              <parameter type-id='type-id-2530'/>
-              <parameter type-id='type-id-1123'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1962' is-artificial='yes'/>
+              <parameter type-id='type-id-1020'/>
+              <parameter type-id='type-id-1163'/>
+              <parameter type-id='type-id-1009'/>
+              <parameter type-id='type-id-2551'/>
+              <parameter type-id='type-id-1135'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-968'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1006'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::__detail::_Select1st, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-980'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1018'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1953' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1966' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-971'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1065'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::allocator&lt;std::__detail::_Hash_node&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, true&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-983'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1077'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1955' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1968' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-974'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1121'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;0, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-986'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1133'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1957' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1970' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;string&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-977'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1149'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;1, std::hash&lt;string&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-989'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1161'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1959' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1972' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-980'>
-          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-995'/>
+        <class-decl name='_Hashtable_ebo_helper&lt;2, std::__detail::_Mod_range_hashing, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='981' column='1' id='type-id-992'>
+          <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1007'/>
           <member-function access='public'>
             <function-decl name='_Hashtable_ebo_helper' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1961' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1974' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Insert&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, false, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='879' column='1' id='type-id-2779'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1962'/>
+        <class-decl name='_Insert&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, false, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='879' column='1' id='type-id-2801'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1975'/>
         </class-decl>
-        <class-decl name='_Insert_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1962'>
+        <class-decl name='_Insert_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='685' column='1' id='type-id-1975'>
           <member-type access='public'>
-            <typedef-decl name='__hashtable' type-id='type-id-498' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='688' column='1' id='type-id-942'/>
+            <typedef-decl name='__hashtable' type-id='type-id-510' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='688' column='1' id='type-id-954'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='value_type' type-id='type-id-3301' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-983'/>
+            <typedef-decl name='value_type' type-id='type-id-3326' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='696' column='1' id='type-id-995'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='__ireturn_type' type-id='type-id-3302' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-3308'/>
+            <typedef-decl name='__ireturn_type' type-id='type-id-3327' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='702' column='1' id='type-id-3333'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='const_iterator' type-id='type-id-2785' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='698' column='1' id='type-id-3309'/>
+            <typedef-decl name='const_iterator' type-id='type-id-2807' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='698' column='1' id='type-id-3334'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='iterator' type-id='type-id-2789' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='697' column='1' id='type-id-3310'/>
+            <typedef-decl name='iterator' type-id='type-id-2811' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='697' column='1' id='type-id-3335'/>
           </member-type>
         </class-decl>
-        <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='77' column='1' id='type-id-986'>
+        <class-decl name='_List_node_base' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='77' column='1' id='type-id-998'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='_M_next' type-id='type-id-1966' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='79' column='1'/>
+            <var-decl name='_M_next' type-id='type-id-1979' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='79' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='_M_prev' type-id='type-id-1966' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='80' column='1'/>
+            <var-decl name='_M_prev' type-id='type-id-1979' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_list.h' line='80' column='1'/>
           </data-member>
         </class-decl>
-        <class-decl name='_Map_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-989'>
+        <class-decl name='_Map_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='548' column='1' id='type-id-1001'>
           <member-type access='public'>
-            <typedef-decl name='mapped_type' type-id='type-id-3275' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-992'/>
+            <typedef-decl name='mapped_type' type-id='type-id-3300' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='567' column='1' id='type-id-1004'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='key_type' type-id='type-id-3306' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-2531'/>
+            <typedef-decl name='key_type' type-id='type-id-3331' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='565' column='1' id='type-id-2552'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-995'>
+        <class-decl name='_Mod_range_hashing' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='440' column='1' id='type-id-1007'>
           <member-type access='public'>
-            <typedef-decl name='first_argument_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-3311'/>
+            <typedef-decl name='first_argument_type' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='442' column='1' id='type-id-3336'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='result_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='444' column='1' id='type-id-3312'/>
+            <typedef-decl name='result_type' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='444' column='1' id='type-id-3337'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='second_argument_type' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-3313'/>
+            <typedef-decl name='second_argument_type' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='443' column='1' id='type-id-3338'/>
           </member-type>
         </class-decl>
-        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-999'>
+        <class-decl name='_Prime_rehash_policy' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='461' column='1' id='type-id-1011'>
           <member-type access='public'>
-            <typedef-decl name='_State' type-id='type-id-92' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2782'/>
+            <typedef-decl name='_State' type-id='type-id-97' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='487' column='1' id='type-id-2804'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_growth_factor' type-id='type-id-1210' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
+            <var-decl name='_S_growth_factor' type-id='type-id-1222' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='503' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='_M_max_load_factor' type-id='type-id-39' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='505' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='_M_next_resize' type-id='type-id-92' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='506' column='1'/>
+            <var-decl name='_M_next_resize' type-id='type-id-97' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='506' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='_Prime_rehash_policy' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1971' is-artificial='yes'/>
+              <parameter type-id='type-id-1984' is-artificial='yes'/>
               <parameter type-id='type-id-39'/>
-              <return type-id='type-id-2675'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-1003'/>
-        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-1006'/>
-        <class-decl name='_Default_ranged_hash' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2528'/>
-        <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3304'/>
-        <class-decl name='_Local_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3307'/>
-        <class-decl name='_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3303'/>
-        <class-decl name='_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3305'/>
+        <class-decl name='_Rehash_base&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::allocator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt; &gt;, std::__detail::_Select1st, std::equal_to&lt;std::basic_string&lt;char&gt; &gt;, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits&lt;true, false, true&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='940' column='1' id='type-id-1015'/>
+        <class-decl name='_Select1st' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='96' column='1' id='type-id-1018'/>
+        <class-decl name='_Default_ranged_hash' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2549'/>
+        <class-decl name='_Local_const_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3329'/>
+        <class-decl name='_Local_iterator&lt;std::basic_string&lt;char&gt;, std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, std::__detail::_Select1st, std::hash&lt;string&gt;, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3332'/>
+        <class-decl name='_Node_const_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3328'/>
+        <class-decl name='_Node_iterator&lt;std::pair&lt;const std::basic_string&lt;char&gt;, mongo::logger::LogDomain&lt;mongo::logger::MessageEventEphemeral&gt; *&gt;, false, true&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3330'/>
       </namespace-decl>
       <function-decl name='allocate_shared&lt;mongo::repl::ReplicationExecutor::Event, std::allocator&lt;mongo::repl::ReplicationExecutor::Event&gt;, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZSt15allocate_sharedIN5mongo4repl19ReplicationExecutor5EventESaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_ERKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt15allocate_sharedIN5mongo4repl19ReplicationExecutor5EventESaIS3_EJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_ERKT0_DpOT1_'>
-        <parameter type-id='type-id-1048' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
-        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
-        <parameter type-id='type-id-1703' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
-        <return type-id='type-id-1201'/>
+        <parameter type-id='type-id-1060' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
+        <parameter type-id='type-id-1515' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
+        <parameter type-id='type-id-1716' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='585' column='1'/>
+        <return type-id='type-id-1213'/>
       </function-decl>
       <function-decl name='make_shared&lt;mongo::repl::ReplicationExecutor::Event, mongo::repl::ReplicationExecutor *, std::_List_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZSt11make_sharedIN5mongo4repl19ReplicationExecutor5EventEJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_EDpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11make_sharedIN5mongo4repl19ReplicationExecutor5EventEJPS2_RSt14_List_iteratorINS0_8executor12TaskExecutor11EventHandleEEEESt10shared_ptrIT_EDpOT0_'>
-        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
-        <parameter type-id='type-id-1703' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
-        <return type-id='type-id-1201'/>
+        <parameter type-id='type-id-1515' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
+        <parameter type-id='type-id-1716' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr.h' line='600' column='1'/>
+        <return type-id='type-id-1213'/>
       </function-decl>
       <function-decl name='__enable_shared_from_this_helper&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' mangled-name='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='855' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz'>
-        <parameter type-id='type-id-1014' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='855' column='1'/>
+        <parameter type-id='type-id-1026' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/shared_ptr_base.h' line='855' column='1'/>
         <parameter is-variadic='yes'/>
-        <return type-id='type-id-2675'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='__distance&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' mangled-name='_ZSt10__distanceISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E15difference_typeES7_S7_St18input_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10__distanceISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E15difference_typeES7_S7_St18input_iterator_tag'>
-        <parameter type-id='type-id-625' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
-        <parameter type-id='type-id-625' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
-        <parameter type-id='type-id-3118' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='74' column='1'/>
-        <return type-id='type-id-3052'/>
+        <parameter type-id='type-id-637' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
+        <parameter type-id='type-id-637' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
+        <parameter type-id='type-id-3143' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='74' column='1'/>
+        <return type-id='type-id-3077'/>
       </function-decl>
       <function-decl name='__distance&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' mangled-name='_ZSt10__distanceISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E15difference_typeES7_S7_St18input_iterator_tag' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10__distanceISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E15difference_typeES7_S7_St18input_iterator_tag'>
-        <parameter type-id='type-id-635' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
-        <parameter type-id='type-id-635' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
-        <parameter type-id='type-id-3118' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='74' column='1'/>
-        <return type-id='type-id-3052'/>
+        <parameter type-id='type-id-647' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
+        <parameter type-id='type-id-647' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='73' column='1'/>
+        <parameter type-id='type-id-3143' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='74' column='1'/>
+        <return type-id='type-id-3077'/>
       </function-decl>
       <function-decl name='distance&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' mangled-name='_ZSt8distanceISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E15difference_typeES7_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8distanceISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E15difference_typeES7_S7_'>
-        <parameter type-id='type-id-625' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
-        <parameter type-id='type-id-625' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
-        <return type-id='type-id-3052'/>
+        <parameter type-id='type-id-637' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
+        <parameter type-id='type-id-637' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
+        <return type-id='type-id-3077'/>
       </function-decl>
       <function-decl name='distance&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' mangled-name='_ZSt8distanceISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E15difference_typeES7_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8distanceISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E15difference_typeES7_S7_'>
-        <parameter type-id='type-id-635' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
-        <parameter type-id='type-id-635' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
-        <return type-id='type-id-3052'/>
+        <parameter type-id='type-id-647' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
+        <parameter type-id='type-id-647' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_funcs.h' line='114' column='1'/>
+        <return type-id='type-id-3077'/>
       </function-decl>
       <function-decl name='__iterator_category&lt;std::_List_const_iterator&lt;mongo::executor::TaskExecutor::EventHandle&gt; &gt;' mangled-name='_ZSt19__iterator_categoryISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E17iterator_categoryERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__iterator_categoryISt20_List_const_iteratorIN5mongo8executor12TaskExecutor11EventHandleEEENSt15iterator_traitsIT_E17iterator_categoryERKS7_'>
-        <parameter type-id='type-id-627' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1'/>
-        <return type-id='type-id-3054'/>
+        <parameter type-id='type-id-639' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1'/>
+        <return type-id='type-id-3079'/>
       </function-decl>
       <function-decl name='__iterator_category&lt;std::_List_const_iterator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt;' mangled-name='_ZSt19__iterator_categoryISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E17iterator_categoryERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__iterator_categoryISt20_List_const_iteratorIN5mongo4repl19ReplicationExecutor8WorkItemEEENSt15iterator_traitsIT_E17iterator_categoryERKS7_'>
-        <parameter type-id='type-id-637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1'/>
-        <return type-id='type-id-3054'/>
+        <parameter type-id='type-id-649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='201' column='1'/>
+        <return type-id='type-id-3079'/>
       </function-decl>
       <function-decl name='make_pair&lt;const mongo::repl::ReplicationExecutor::WorkItem &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt9make_pairIRKN5mongo4repl19ReplicationExecutor8WorkItemERKNS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENSC_IT0_E6__typeEEOSD_OSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9make_pairIRKN5mongo4repl19ReplicationExecutor8WorkItemERKNS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENSC_IT0_E6__typeEEOSD_OSG_'>
-        <parameter type-id='type-id-447' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
-        <parameter type-id='type-id-400' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
-        <return type-id='type-id-1192'/>
+        <parameter type-id='type-id-459' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <parameter type-id='type-id-413' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <return type-id='type-id-1204'/>
       </function-decl>
       <function-decl name='make_pair&lt;mongo::repl::ReplicationExecutor::WorkItem, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt9make_pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENS8_IT0_E6__typeEEOS9_OSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9make_pairIN5mongo4repl19ReplicationExecutor8WorkItemENS0_8executor12TaskExecutor14CallbackHandleEESt4pairINSt17__decay_and_stripIT_E6__typeENS8_IT0_E6__typeEEOS9_OSC_'>
-        <parameter type-id='type-id-1508' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
-        <parameter type-id='type-id-1472' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
-        <return type-id='type-id-1192'/>
+        <parameter type-id='type-id-1521' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <parameter type-id='type-id-1485' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_pair.h' line='276' column='1'/>
+        <return type-id='type-id-1204'/>
       </function-decl>
-      <typedef-decl name='string' type-id='type-id-2549' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-2552'/>
+      <typedef-decl name='string' type-id='type-id-2570' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-2573'/>
       <namespace-decl name='chrono'>
-        <class-decl name='__duration_cast_impl&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt;, std::ratio&lt;1, 1&gt;, long, true, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='143' column='1' id='type-id-3314'>
+        <class-decl name='__duration_cast_impl&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt;, std::ratio&lt;1, 1&gt;, long, true, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='143' column='1' id='type-id-3339'>
           <member-function access='public' static='yes'>
             <function-decl name='__cast&lt;long, std::ratio&lt;1, 1000&gt; &gt;' mangled-name='_ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1000EEEES2_ILl1ELl1EElLb1ELb1EE6__castIlS3_EES4_RKNS1_IT_T0_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1000EEEES2_ILl1ELl1EElLb1ELb1EE6__castIlS3_EES4_RKNS1_IT_T0_EE'>
-              <parameter type-id='type-id-1087'/>
-              <return type-id='type-id-1085'/>
+              <parameter type-id='type-id-1099'/>
+              <return type-id='type-id-1097'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1081'>
+        <class-decl name='duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1093'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1089' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1101' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <parameter type-id='type-id-1083'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <parameter type-id='type-id-1095'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <parameter type-id='type-id-1083'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <parameter type-id='type-id-1095'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <parameter type-id='type-id-1083'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <parameter type-id='type-id-1095'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2035' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2048' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long, std::ratio&lt;1, 1000&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1085'>
+        <class-decl name='duration&lt;long, std::ratio&lt;1, 1000&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1097'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-42' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='243' column='1' id='type-id-1089'/>
+            <typedef-decl name='rep' type-id='type-id-44' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='243' column='1' id='type-id-1101'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1089' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1101' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <parameter type-id='type-id-1087'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <parameter type-id='type-id-1099'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration&lt;long, void&gt;' mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEC2IlvEERKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEC2IlvEERKT_'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <parameter type-id='type-id-285'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <parameter type-id='type-id-298'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration&lt;long long, void&gt;' mangled-name='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEC2IxvEERKT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chrono8durationIlSt5ratioILl1ELl1000EEEC2IxvEERKT_'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <parameter type-id='type-id-287'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <parameter type-id='type-id-300'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='count' mangled-name='_ZNKSt6chrono8durationIlSt5ratioILl1ELl1000EEE5countEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6chrono8durationIlSt5ratioILl1ELl1000EEE5countEv'>
-              <parameter type-id='type-id-1088' is-artificial='yes'/>
-              <return type-id='type-id-1089'/>
+              <parameter type-id='type-id-1100' is-artificial='yes'/>
+              <return type-id='type-id-1101'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <parameter type-id='type-id-1087'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <parameter type-id='type-id-1099'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <parameter type-id='type-id-1087'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <parameter type-id='type-id-1099'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2037' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2050' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='duration&lt;long, std::ratio&lt;1, 1&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1092'>
+        <class-decl name='duration&lt;long, std::ratio&lt;1, 1&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='241' column='1' id='type-id-1104'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__r' type-id='type-id-1089' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
+            <var-decl name='__r' type-id='type-id-1101' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='373' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <parameter type-id='type-id-1094'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <parameter type-id='type-id-1106'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <parameter type-id='type-id-1094'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <parameter type-id='type-id-1106'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <parameter type-id='type-id-1094'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <parameter type-id='type-id-1106'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~duration' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2039' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2052' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='546' column='1' id='type-id-1096'>
+        <class-decl name='time_point&lt;std::chrono::_V2::system_clock, std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='546' column='1' id='type-id-1108'>
           <member-type access='public'>
-            <typedef-decl name='duration' type-id='type-id-1081' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='549' column='1' id='type-id-1099'/>
+            <typedef-decl name='duration' type-id='type-id-1093' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='549' column='1' id='type-id-1111'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='__d' type-id='type-id-1099' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='596' column='1'/>
+            <var-decl name='__d' type-id='type-id-1111' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='596' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <parameter type-id='type-id-1101'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <parameter type-id='type-id-1113'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <parameter type-id='type-id-1101'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <parameter type-id='type-id-1113'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='time_point' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2041' is-artificial='yes'/>
-              <parameter type-id='type-id-1101'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-2054' is-artificial='yes'/>
+              <parameter type-id='type-id-1113'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='milliseconds' type-id='type-id-1085' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='533' column='1' id='type-id-3315'/>
-        <typedef-decl name='seconds' type-id='type-id-1092' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='536' column='1' id='type-id-3316'/>
+        <typedef-decl name='milliseconds' type-id='type-id-1097' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='533' column='1' id='type-id-3340'/>
+        <typedef-decl name='seconds' type-id='type-id-1104' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='536' column='1' id='type-id-3341'/>
         <function-decl name='duration_cast&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt;, long, std::ratio&lt;1, 1000&gt; &gt;' mangled-name='_ZNSt6chrono13duration_castINS_8durationIlSt5ratioILl1ELl1000EEEElS3_EENSt9enable_ifIXsr13__is_durationIT_EE5valueES6_E4typeERKNS1_IT0_T1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chrono13duration_castINS_8durationIlSt5ratioILl1ELl1000EEEElS3_EENSt9enable_ifIXsr13__is_durationIT_EE5valueES6_E4typeERKNS1_IT0_T1_EE'>
-          <parameter type-id='type-id-1087' name='__d' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='194' column='1'/>
-          <return type-id='type-id-3115'/>
+          <parameter type-id='type-id-1099' name='__d' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='194' column='1'/>
+          <return type-id='type-id-3140'/>
         </function-decl>
         <function-decl name='operator==&lt;long, std::ratio&lt;1, 1000&gt;, long, std::ratio&lt;1, 1000&gt; &gt;' mangled-name='_ZNSt6chronoeqIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chronoeqIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE'>
-          <parameter type-id='type-id-1087' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='477' column='1'/>
-          <parameter type-id='type-id-1087' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='478' column='1'/>
+          <parameter type-id='type-id-1099' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='477' column='1'/>
+          <parameter type-id='type-id-1099' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='478' column='1'/>
           <return type-id='type-id-1'/>
         </function-decl>
         <function-decl name='operator&lt;&lt;long, std::ratio&lt;1, 1000&gt;, long, std::ratio&lt;1, 1000&gt; &gt;' mangled-name='_ZNSt6chronoltIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chronoltIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE'>
-          <parameter type-id='type-id-1087' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='489' column='1'/>
-          <parameter type-id='type-id-1087' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='490' column='1'/>
+          <parameter type-id='type-id-1099' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='489' column='1'/>
+          <parameter type-id='type-id-1099' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='490' column='1'/>
           <return type-id='type-id-1'/>
         </function-decl>
         <function-decl name='operator&gt;&lt;long, std::ratio&lt;1, 1000&gt;, long, std::ratio&lt;1, 1000&gt; &gt;' mangled-name='_ZNSt6chronogtIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6chronogtIlSt5ratioILl1ELl1000EElS2_EEbRKNS_8durationIT_T0_EERKNS3_IT1_T2_EE'>
-          <parameter type-id='type-id-1087' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='515' column='1'/>
-          <parameter type-id='type-id-1087' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='516' column='1'/>
+          <parameter type-id='type-id-1099' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='515' column='1'/>
+          <parameter type-id='type-id-1099' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='516' column='1'/>
           <return type-id='type-id-1'/>
         </function-decl>
         <namespace-decl name='_V2'>
-          <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='716' column='1' id='type-id-3317'>
+          <class-decl name='system_clock' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='716' column='1' id='type-id-3342'>
             <member-type access='public'>
-              <typedef-decl name='time_point' type-id='type-id-1096' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='721' column='1' id='type-id-1078'/>
+              <typedef-decl name='time_point' type-id='type-id-1108' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='721' column='1' id='type-id-1090'/>
             </member-type>
             <data-member access='public' static='yes'>
-              <var-decl name='is_steady' type-id='type-id-236' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='727' column='1'/>
+              <var-decl name='is_steady' type-id='type-id-249' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/chrono' line='727' column='1'/>
             </data-member>
           </class-decl>
         </namespace-decl>
       </namespace-decl>
       <function-decl name='bind&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' mangled-name='_ZSt4bindIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEJRS6_S9_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_DnEEJRS6_S9_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_'>
-        <parameter type-id='type-id-476' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2593' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-356' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2171'/>
+        <parameter type-id='type-id-488' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2614' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-369' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2186'/>
       </function-decl>
       <function-decl name='bind&lt;const std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *)&gt; &amp;, mongo::OperationContext *&amp;, const mongo::Status &amp;&gt;' mangled-name='_ZSt4bindIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEJRS6_S9_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRKSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvPNS2_16OperationContextERKNS2_6StatusERKNS2_8executor12TaskExecutor14CallbackHandleEPSt4listINS4_8WorkItemESaISG_EEPSt5mutexEEPS4_St12_PlaceholderILi1EESQ_ILi2EESC_SJ_SL_EEJRS6_S9_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_'>
-        <parameter type-id='type-id-479' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2593' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-356' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2173'/>
+        <parameter type-id='type-id-491' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2614' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-369' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2188'/>
       </function-decl>
       <function-decl name='bind&lt;const std::function&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;)&gt; &amp;, mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt4bindIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESC_JDpT0_EE4typeEOSC_DpOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRKSt8functionIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESC_JDpT0_EE4typeEOSC_DpOSD_'>
-        <parameter type-id='type-id-1143' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1469' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2183'/>
+        <parameter type-id='type-id-1155' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1482' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2198'/>
       </function-decl>
       <function-decl name='bind&lt;mongo::OperationContext *(mongo::repl::StorageInterface::*)(), mongo::repl::StorageInterface *&amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEJRPS2_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESA_JDpT0_EE4typeEOSA_DpOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl16StorageInterfaceEFPNS0_16OperationContextEvEJRPS2_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESA_JDpT0_EE4typeEOSA_DpOSB_'>
-        <parameter type-id='type-id-2625' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2175'/>
+        <parameter type-id='type-id-1446' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2646' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2190'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, mongo::executor::RemoteCommandRequest &amp;&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEJRKSt12_PlaceholderILi1EESD_RSE_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESP_JDpT0_EE4typeEOSP_DpOSQ_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestEEJRKSt12_PlaceholderILi1EESD_RSE_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESP_JDpT0_EE4typeEOSP_DpOSQ_'>
-        <parameter type-id='type-id-2481' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1462' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2185'/>
+        <parameter type-id='type-id-2500' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1159' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1475' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2200'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;), const std::_Placeholder&lt;1&gt; &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;, const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEJRKSt12_PlaceholderILi1EESD_SG_SL_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueEST_JDpT0_EE4typeEOST_DpOSU_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsERKSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEERKNS1_20RemoteCommandRequestERKNS0_10StatusWithINS1_21RemoteCommandResponseEEEEJRKSt12_PlaceholderILi1EESD_SG_SL_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueEST_JDpT0_EE4typeEOST_DpOSU_'>
-        <parameter type-id='type-id-2482' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-386' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-360' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2187'/>
+        <parameter type-id='type-id-2501' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1159' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-399' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-373' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2202'/>
       </function-decl>
       <function-decl name='bind&lt;void (&amp;)(const std::function&lt;void ()&gt; &amp;), const std::function&lt;void ()&gt; &amp;&gt;' mangled-name='_ZSt4bindIRFvRKSt8functionIFvvEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueES8_JDpT0_EE4typeEOS8_DpOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKSt8functionIFvvEEEJS4_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueES8_JDpT0_EE4typeEOS8_DpOS9_'>
-        <parameter type-id='type-id-2483' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1135' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2190'/>
+        <parameter type-id='type-id-2502' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2205'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::RemoteCommandRequest &amp;, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;), mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest &amp;, const std::_Placeholder&lt;1&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, unsigned long &amp;, const std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEJPS2_RS4_RKSt12_PlaceholderILi1EERSD_RmSN_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor20RemoteCommandRequestERKNS0_10StatusWithINS3_21RemoteCommandResponseEEERKNS3_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSC_25RemoteCommandCallbackArgsEEEEJPS2_RS4_RKSt12_PlaceholderILi1EERSD_RmSN_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESZ_JDpT0_EE4typeEOSZ_DpOS10_'>
-        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1462' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2448' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1147' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2177'/>
+        <parameter type-id='type-id-2503' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1515' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1475' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1484' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2467' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1159' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2192'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_DnEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_DnEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_'>
-        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-679' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2091' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2179'/>
+        <parameter type-id='type-id-2504' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1515' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-691' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1484' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2104' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2194'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(mongo::OperationContext *, const mongo::Status &amp;, const mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *), mongo::repl::ReplicationExecutor *, const std::_Placeholder&lt;1&gt; &amp;, const std::_Placeholder&lt;2&gt; &amp;, mongo::executor::TaskExecutor::CallbackHandle &amp;, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_SJ_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvPNS0_16OperationContextERKNS0_6StatusERKNS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISE_EEPSt5mutexEJPS2_RKSt12_PlaceholderILi1EERKSN_ILi2EERSA_SH_SJ_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESW_JDpT0_EE4typeEOSW_DpOSX_'>
-        <parameter type-id='type-id-1502' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-679' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2091' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-2105' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-2181'/>
-      </function-decl>
-      <typedef-decl name='ostream' type-id='type-id-3294' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/iosfwd' line='136' column='1' id='type-id-2643'/>
+        <parameter type-id='type-id-2504' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1515' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-691' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1484' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2104' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-2118' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-2196'/>
+      </function-decl>
+      <typedef-decl name='ostream' type-id='type-id-3319' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/iosfwd' line='136' column='1' id='type-id-2665'/>
       <function-decl name='operator==' mangled-name='_ZSteqNSt6thread2idES0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqNSt6thread2idES0_'>
-        <parameter type-id='type-id-2354' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='83' column='1'/>
-        <parameter type-id='type-id-2354' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='83' column='1'/>
+        <parameter type-id='type-id-2373' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='83' column='1'/>
+        <parameter type-id='type-id-2373' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/thread' line='83' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE'>
-        <parameter type-id='type-id-1747' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2805'/>
+        <parameter type-id='type-id-1760' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2830'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor12CallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1750' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2808'/>
+        <parameter type-id='type-id-1763' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2833'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERPN5mongo16OperationContextEJRNS0_6StatusEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERPN5mongo16OperationContextEJRNS0_6StatusEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1753' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3000'/>
+        <parameter type-id='type-id-1766' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3025'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::OperationContext *, mongo::Status&gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo16OperationContextEJNS0_6StatusEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo16OperationContextEJNS0_6StatusEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE'>
-        <parameter type-id='type-id-1757' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3002'/>
+        <parameter type-id='type-id-1770' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3027'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::Status &amp;&gt;' mangled-name='_ZSt12__get_helperILm1ERN5mongo6StatusEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ERN5mongo6StatusEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE'>
-        <parameter type-id='type-id-1810' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2821'/>
+        <parameter type-id='type-id-1823' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2846'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::Status&gt;' mangled-name='_ZSt12__get_helperILm1EN5mongo6StatusEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EN5mongo6StatusEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE'>
-        <parameter type-id='type-id-1813' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2821'/>
+        <parameter type-id='type-id-1826' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2846'/>
       </function-decl>
       <function-decl name='__get_helper&lt;3, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;&gt;' mangled-name='_ZSt12__get_helperILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm3EN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-1878' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3006'/>
+        <parameter type-id='type-id-1891' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3031'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo8executor16NetworkInterfaceEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo8executor16NetworkInterfaceEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1761' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3008'/>
+        <parameter type-id='type-id-1774' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3033'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt12__get_helperILm1EN5mongo8executor20RemoteCommandRequestEJSt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EN5mongo8executor20RemoteCommandRequestEJSt12_PlaceholderILi1EENS1_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS5_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE'>
-        <parameter type-id='type-id-1816' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-1829' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt12__get_helperILm2EN5mongo8executor20RemoteCommandRequestEJNS0_10StatusWithINS1_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2EN5mongo8executor20RemoteCommandRequestEJNS0_10StatusWithINS1_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1855' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-1868' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt12__get_helperILm2EN5mongo8executor20RemoteCommandRequestEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2EN5mongo8executor20RemoteCommandRequestEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE'>
-        <parameter type-id='type-id-1859' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-1872' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt12__get_helperILm0EN5mongo8executor12TaskExecutor12CallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EN5mongo8executor12TaskExecutor12CallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE'>
-        <parameter type-id='type-id-1765' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3012'/>
+        <parameter type-id='type-id-1778' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3037'/>
       </function-decl>
       <function-decl name='__get_helper&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSC_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSC_DpT1_EE'>
-        <parameter type-id='type-id-1882' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-1895' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='__get_helper&lt;3, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJPSt4listINS0_4repl19ReplicationExecutor8WorkItemESaIS7_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE'>
-        <parameter type-id='type-id-1886' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-1899' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='__get_helper&lt;3, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm3EN5mongo8executor12TaskExecutor14CallbackHandleEJmSt8functionIFvRKNS2_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE'>
-        <parameter type-id='type-id-1890' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-1903' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJNS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSH_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJNS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSH_DpT1_EE'>
-        <parameter type-id='type-id-1768' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-1781' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE'>
-        <parameter type-id='type-id-1772' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-1785' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSI_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSI_DpT1_EE'>
-        <parameter type-id='type-id-1776' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-1789' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl16StorageInterfaceEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl16StorageInterfaceEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1780' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3017'/>
+        <parameter type-id='type-id-1793' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3042'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::StorageInterface *&gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl16StorageInterfaceEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl16StorageInterfaceEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE'>
-        <parameter type-id='type-id-1784' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3017'/>
+        <parameter type-id='type-id-1797' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3042'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE'>
-        <parameter type-id='type-id-1787' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-1800' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE'>
-        <parameter type-id='type-id-1791' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-1804' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJS0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSF_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJS0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSF_DpT1_EE'>
-        <parameter type-id='type-id-1820' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-1833' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJS0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSH_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJS0_ILi2EEN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS3_4repl19ReplicationExecutor8WorkItemESaISA_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSH_DpT1_EE'>
-        <parameter type-id='type-id-1824' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-1837' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt12__get_helperILm2ESt12_PlaceholderILi1EEJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2ESt12_PlaceholderILi1EEJN5mongo8executor12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS4_25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE'>
-        <parameter type-id='type-id-1863' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-1876' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm2ESt12_PlaceholderILi2EEJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2ESt12_PlaceholderILi2EEJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE'>
-        <parameter type-id='type-id-1867' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3022'/>
+        <parameter type-id='type-id-1880' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3047'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm2ESt12_PlaceholderILi2EEJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2ESt12_PlaceholderILi2EEJN5mongo8executor12TaskExecutor14CallbackHandleEPSt4listINS2_4repl19ReplicationExecutor8WorkItemESaIS9_EEPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSG_DpT1_EE'>
-        <parameter type-id='type-id-1871' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3022'/>
+        <parameter type-id='type-id-1884' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3047'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::default_delete&lt;mongo::executor::NetworkInterface&gt;&gt;' mangled-name='_ZSt12__get_helperILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt14default_deleteIN5mongo8executor16NetworkInterfaceEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-1828' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3024'/>
+        <parameter type-id='type-id-1841' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3049'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::default_delete&lt;mongo::repl::StorageInterface&gt;&gt;' mangled-name='_ZSt12__get_helperILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt14default_deleteIN5mongo4repl16StorageInterfaceEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-1832' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3026'/>
+        <parameter type-id='type-id-1845' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3051'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt;&gt;' mangled-name='_ZSt12__get_helperILm1ESt14default_deleteISt10lock_guardISt5mutexEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt14default_deleteISt10lock_guardISt5mutexEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-1838' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3028'/>
+        <parameter type-id='type-id-1851' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3053'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::function&lt;void ()&gt;&gt;' mangled-name='_ZSt12__get_helperILm0ESt8functionIFvvEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt8functionIFvvEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS4_DpT1_EE'>
-        <parameter type-id='type-id-1799' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3030'/>
+        <parameter type-id='type-id-1812' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3055'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt12__get_helperILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJNS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJNS2_20RemoteCommandRequestENS1_10StatusWithINS2_21RemoteCommandResponseEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSE_DpT1_EE'>
-        <parameter type-id='type-id-1841' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-1854' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt12__get_helperILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJNS2_20RemoteCommandRequestEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJNS2_20RemoteCommandRequestEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE'>
-        <parameter type-id='type-id-1845' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-1858' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='__get_helper&lt;5, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;&gt;' mangled-name='_ZSt12__get_helperILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSA_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm5ESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSA_DpT1_EE'>
-        <parameter type-id='type-id-1915' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-1928' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='__get_helper&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEJDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS9_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEJDnEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS9_DpT1_EE'>
-        <parameter type-id='type-id-1897' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3034'/>
+        <parameter type-id='type-id-1910' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3059'/>
       </function-decl>
       <function-decl name='__get_helper&lt;4, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEJPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm4EPSt4listIN5mongo4repl19ReplicationExecutor8WorkItemESaIS4_EEJPSt5mutexEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE'>
-        <parameter type-id='type-id-1901' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3034'/>
+        <parameter type-id='type-id-1914' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3059'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPSt10lock_guardISt5mutexEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPSt10lock_guardISt5mutexEJSt14default_deleteIS2_EEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-1802' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3036'/>
+        <parameter type-id='type-id-1815' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3061'/>
       </function-decl>
       <function-decl name='__get_helper&lt;5, std::mutex *&gt;' mangled-name='_ZSt12__get_helperILm5EPSt5mutexJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm5EPSt5mutexJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE'>
-        <parameter type-id='type-id-1918' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3038'/>
+        <parameter type-id='type-id-1931' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3063'/>
       </function-decl>
       <function-decl name='__get_helper&lt;4, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt12__get_helperILm4EmJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSA_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm4EmJSt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSA_DpT1_EE'>
-        <parameter type-id='type-id-1905' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3040'/>
+        <parameter type-id='type-id-1918' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3065'/>
       </function-decl>
       <function-decl name='__get_helper&lt;5, nullptr_t&gt;' mangled-name='_ZSt12__get_helperILm5EDnJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS1_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm5EDnJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS1_DpT1_EE'>
-        <parameter type-id='type-id-1912' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1925' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo8executor16NetworkInterfaceEJSt14default_deleteIS2_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo8executor16NetworkInterfaceEJSt14default_deleteIS2_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-721' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1'/>
-        <return type-id='type-id-2975'/>
+        <parameter type-id='type-id-733' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1'/>
+        <return type-id='type-id-3000'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEJSt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS9_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEJSt14default_deleteIS4_EEENSt11__add_c_refIT0_E4typeERKSt11_Tuple_implIXT_EJS9_DpT1_EE'>
-        <parameter type-id='type-id-769' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1'/>
-        <return type-id='type-id-2977'/>
+        <parameter type-id='type-id-781' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='750' column='1'/>
+        <return type-id='type-id-3002'/>
       </function-decl>
       <function-decl name='get&lt;0, const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt3getILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSC_'>
-        <parameter type-id='type-id-2364' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2805'/>
+        <parameter type-id='type-id-2383' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2830'/>
       </function-decl>
       <function-decl name='get&lt;0, const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor12CallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2367' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2808'/>
+        <parameter type-id='type-id-2386' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2833'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt3getILm0EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2370' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3000'/>
+        <parameter type-id='type-id-2389' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3025'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::OperationContext *, mongo::Status&gt;' mangled-name='_ZSt3getILm0EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_'>
-        <parameter type-id='type-id-2373' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3002'/>
+        <parameter type-id='type-id-2392' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3027'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJRPN5mongo16OperationContextERNS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2370' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2821'/>
+        <parameter type-id='type-id-2389' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2846'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::OperationContext *, mongo::Status&gt;' mangled-name='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo16OperationContextENS0_6StatusEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_'>
-        <parameter type-id='type-id-2373' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2821'/>
+        <parameter type-id='type-id-2392' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2846'/>
       </function-decl>
       <function-decl name='get&lt;3, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm3EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2397' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3006'/>
+        <parameter type-id='type-id-2416' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3031'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2376' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3008'/>
+        <parameter type-id='type-id-2395' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3033'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2397' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-2416' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-2400' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3010'/>
+        <parameter type-id='type-id-2419' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3035'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::executor::TaskExecutor::CallbackArgs&gt;' mangled-name='_ZSt3getILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJN5mongo8executor12TaskExecutor12CallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_'>
-        <parameter type-id='type-id-2379' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3012'/>
+        <parameter type-id='type-id-2398' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3037'/>
       </function-decl>
       <function-decl name='get&lt;3, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='get&lt;3, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='get&lt;3, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm3EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2391' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3017'/>
+        <parameter type-id='type-id-2410' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3042'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::StorageInterface *&gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl16StorageInterfaceEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl16StorageInterfaceEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS9_'>
-        <parameter type-id='type-id-2394' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3017'/>
+        <parameter type-id='type-id-2413' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3042'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2397' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-2416' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-2400' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-2419' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3022'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3047'/>
       </function-decl>
       <function-decl name='get&lt;2, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3022'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3047'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2376' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3024'/>
+        <parameter type-id='type-id-2395' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3049'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::StorageInterface *, std::default_delete&lt;mongo::repl::StorageInterface&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl16StorageInterfaceESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2391' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3026'/>
+        <parameter type-id='type-id-2410' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3051'/>
       </function-decl>
       <function-decl name='get&lt;1, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt3getILm1EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2409' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3028'/>
+        <parameter type-id='type-id-2428' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3053'/>
       </function-decl>
       <function-decl name='get&lt;0, std::function&lt;void ()&gt; &gt;' mangled-name='_ZSt3getILm0EJSt8functionIFvvEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt8functionIFvvEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERS8_'>
-        <parameter type-id='type-id-2406' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3030'/>
+        <parameter type-id='type-id-2425' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3055'/>
       </function-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest, mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestENS3_10StatusWithINS4_21RemoteCommandResponseEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2397' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-2416' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt;, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EESt8functionIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENS4_20RemoteCommandRequestEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-2400' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-2419' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3032'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3057'/>
       </function-decl>
       <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3034'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3059'/>
       </function-decl>
       <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3034'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3059'/>
       </function-decl>
       <function-decl name='get&lt;0, std::lock_guard&lt;std::mutex&gt; *, std::default_delete&lt;std::lock_guard&lt;std::mutex&gt; &gt; &gt;' mangled-name='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPSt10lock_guardISt5mutexESt14default_deleteIS2_EEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2409' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3036'/>
+        <parameter type-id='type-id-2428' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3061'/>
       </function-decl>
       <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, std::mutex *&gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEPSt5mutexEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSM_'>
-        <parameter type-id='type-id-2388' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3038'/>
+        <parameter type-id='type-id-2407' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3063'/>
       </function-decl>
       <function-decl name='get&lt;4, mongo::repl::ReplicationExecutor *, mongo::executor::RemoteCommandRequest, std::_Placeholder&lt;1&gt;, mongo::executor::TaskExecutor::CallbackHandle, unsigned long, std::function&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;)&gt; &gt;' mangled-name='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm4EJPN5mongo4repl19ReplicationExecutorENS0_8executor20RemoteCommandRequestESt12_PlaceholderILi1EENS4_12TaskExecutor14CallbackHandleEmSt8functionIFvRKNS8_25RemoteCommandCallbackArgsEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSL_'>
-        <parameter type-id='type-id-2382' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3040'/>
+        <parameter type-id='type-id-2401' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3065'/>
       </function-decl>
       <function-decl name='get&lt;5, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;, std::_Placeholder&lt;2&gt;, mongo::executor::TaskExecutor::CallbackHandle, std::list&lt;mongo::repl::ReplicationExecutor::WorkItem, std::allocator&lt;mongo::repl::ReplicationExecutor::WorkItem&gt; &gt; *, nullptr_t&gt;' mangled-name='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm5EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EES4_ILi2EENS0_8executor12TaskExecutor14CallbackHandleEPSt4listINS2_8WorkItemESaISB_EEDnEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSK_'>
-        <parameter type-id='type-id-2385' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-2404' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::executor::NetworkInterface *, std::default_delete&lt;mongo::executor::NetworkInterface&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo8executor16NetworkInterfaceESt14default_deleteIS2_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKSB_'>
-        <parameter type-id='type-id-1236' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1'/>
-        <return type-id='type-id-2975'/>
+        <parameter type-id='type-id-1248' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1'/>
+        <return type-id='type-id-3000'/>
       </function-decl>
       <function-decl name='get&lt;0, std::basic_ostringstream&lt;char&gt; *, std::default_delete&lt;std::basic_ostringstream&lt;char&gt; &gt; &gt;' mangled-name='_ZSt3getILm0EJPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPSt19basic_ostringstreamIcSt11char_traitsIcESaIcEESt14default_deleteIS4_EEENSt11__add_c_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERKSD_'>
-        <parameter type-id='type-id-1263' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1'/>
-        <return type-id='type-id-2977'/>
+        <parameter type-id='type-id-1275' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='766' column='1'/>
+        <return type-id='type-id-3002'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;&gt;' mangled-name='_ZSt16forward_as_tupleIJEESt5tupleIJDpOT_EES3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJEESt5tupleIJDpOT_EES3_'>
-        <return type-id='type-id-2360'/>
+        <return type-id='type-id-2379'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;const mongo::StatusWith&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEESt5tupleIJDpOT_EESA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRKN5mongo10StatusWithINS0_8executor21RemoteCommandResponseEEEEESt5tupleIJDpOT_EESA_'>
-        <parameter type-id='type-id-360' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-1222'/>
+        <parameter type-id='type-id-373' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <return type-id='type-id-1234'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEESt5tupleIJDpOT_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor12CallbackArgsEEESt5tupleIJDpOT_EES9_'>
-        <parameter type-id='type-id-394' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-1225'/>
+        <parameter type-id='type-id-407' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <return type-id='type-id-1237'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;mongo::OperationContext *&amp;, mongo::Status &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRPN5mongo16OperationContextERNS0_6StatusEEESt5tupleIJDpOT_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRPN5mongo16OperationContextERNS0_6StatusEEESt5tupleIJDpOT_EES9_'>
-        <parameter type-id='type-id-2593' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <parameter type-id='type-id-1442' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-1228'/>
+        <parameter type-id='type-id-2614' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <parameter type-id='type-id-1455' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <return type-id='type-id-1240'/>
       </function-decl>
     </namespace-decl>
     <function-decl name='isalnum' filepath='/usr/include/ctype.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18827,149 +18887,149 @@
     </function-decl>
     <function-decl name='setlocale' filepath='/usr/include/locale.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='localeconv' filepath='/usr/include/locale.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-2583'/>
+      <return type-id='type-id-2604'/>
     </function-decl>
-    <typedef-decl name='FILE' type-id='type-id-2668' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-2507'/>
-    <typedef-decl name='__FILE' type-id='type-id-2668' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-2510'/>
+    <typedef-decl name='FILE' type-id='type-id-2690' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-2528'/>
+    <typedef-decl name='__FILE' type-id='type-id-2690' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-2531'/>
     <function-decl name='remove' filepath='/usr/include/stdio.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='rename' filepath='/usr/include/stdio.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='tmpfile' filepath='/usr/include/stdio.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-2508'/>
+      <return type-id='type-id-2529'/>
     </function-decl>
     <function-decl name='tmpnam' filepath='/usr/include/stdio.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-192'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-205'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='fclose' filepath='/usr/include/stdio.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fflush' filepath='/usr/include/stdio.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fopen' filepath='/usr/include/stdio.h' line='272' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-271'/>
-      <return type-id='type-id-2508'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-284'/>
+      <return type-id='type-id-2529'/>
     </function-decl>
     <function-decl name='freopen' filepath='/usr/include/stdio.h' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-2509'/>
-      <return type-id='type-id-2508'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-2530'/>
+      <return type-id='type-id-2529'/>
     </function-decl>
     <function-decl name='setbuf' filepath='/usr/include/stdio.h' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-193'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-206'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='setvbuf' filepath='/usr/include/stdio.h' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-206'/>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fprintf' filepath='/usr/include/stdio.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='printf' filepath='/usr/include/stdio.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='sprintf' filepath='/usr/include/stdio.h' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vfprintf' filepath='/usr/include/stdio.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vprintf' filepath='/usr/include/stdio.h' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vsprintf' filepath='/usr/include/stdio.h' line='379' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vsnprintf' filepath='/usr/include/stdio.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='scanf' filepath='/usr/include/stdio.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='sscanf' filepath='/usr/include/stdio.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-271'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-284'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vfscanf' filepath='/usr/include/stdio.h' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vscanf' filepath='/usr/include/stdio.h' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vsscanf' filepath='/usr/include/stdio.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fgetc' filepath='/usr/include/stdio.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='getc' filepath='/usr/include/stdio.h' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='getchar' filepath='/usr/include/stdio.h' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18977,12 +19037,12 @@
     </function-decl>
     <function-decl name='fputc' filepath='/usr/include/stdio.h' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='putc' filepath='/usr/include/stdio.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='putchar' filepath='/usr/include/stdio.h' line='580' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -18990,814 +19050,814 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fgets' filepath='/usr/include/stdio.h' line='622' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-206'/>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-2509'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-2530'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='gets' filepath='/usr/include/stdio.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-192'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-205'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='fputs' filepath='/usr/include/stdio.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-2509'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-2530'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='puts' filepath='/usr/include/stdio.h' line='695' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='ungetc' filepath='/usr/include/stdio.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fread' filepath='/usr/include/stdio.h' line='709' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2669'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-2509'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2691'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-2530'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='fwrite' filepath='/usr/include/stdio.h' line='715' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2670'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-2509'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2692'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-2530'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='fseek' filepath='/usr/include/stdio.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-2529'/>
+      <parameter type-id='type-id-44'/>
       <parameter type-id='type-id-40'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='ftell' filepath='/usr/include/stdio.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-2529'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='rewind' filepath='/usr/include/stdio.h' line='759' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-2529'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='fgetpos' filepath='/usr/include/stdio.h' line='798' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2509'/>
-      <parameter type-id='type-id-1401'/>
+      <parameter type-id='type-id-2530'/>
+      <parameter type-id='type-id-1413'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fsetpos' filepath='/usr/include/stdio.h' line='803' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
-      <parameter type-id='type-id-282'/>
+      <parameter type-id='type-id-2529'/>
+      <parameter type-id='type-id-295'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='clearerr' filepath='/usr/include/stdio.h' line='826' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-2529'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='feof' filepath='/usr/include/stdio.h' line='828' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='ferror' filepath='/usr/include/stdio.h' line='830' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2508'/>
+      <parameter type-id='type-id-2529'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='perror' filepath='/usr/include/stdio.h' line='846' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='atof' filepath='/usr/include/stdlib.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='atoi' filepath='/usr/include/stdlib.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='atol' filepath='/usr/include/stdlib.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='atoll' filepath='/usr/include/stdlib.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='strtod' filepath='/usr/include/stdlib.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='strtof' filepath='/usr/include/stdlib.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='strtold' filepath='/usr/include/stdlib.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-91'/>
+      <return type-id='type-id-96'/>
     </function-decl>
     <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-102'/>
+      <return type-id='type-id-107'/>
     </function-decl>
     <function-decl name='rand' filepath='/usr/include/stdlib.h' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='srand' filepath='/usr/include/stdlib.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-48'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-53'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='malloc' filepath='/usr/include/stdlib.h' line='466' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='480' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-57'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='abort' filepath='/usr/include/stdlib.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-2675'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='atexit' filepath='/usr/include/stdlib.h' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2480'/>
+      <parameter type-id='type-id-2499'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='at_quick_exit' filepath='/usr/include/stdlib.h' line='524' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2480'/>
+      <parameter type-id='type-id-2499'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='exit' filepath='/usr/include/stdlib.h' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-2675'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='quick_exit' filepath='/usr/include/stdlib.h' line='549' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-2675'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='_Exit' filepath='/usr/include/stdlib.h' line='557' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-2675'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='getenv' filepath='/usr/include/stdlib.h' line='564' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='system' filepath='/usr/include/stdlib.h' line='716' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='754' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-65'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-70'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-65'/>
-      <return type-id='type-id-2675'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-70'/>
+      <return type-id='type-id-2697'/>
     </function-decl>
     <function-decl name='abs' filepath='/usr/include/stdlib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='labs' filepath='/usr/include/stdlib.h' line='775' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='llabs' filepath='/usr/include/stdlib.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-43'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-45'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='div' filepath='/usr/include/stdlib.h' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-84'/>
     </function-decl>
     <function-decl name='ldiv' filepath='/usr/include/stdlib.h' line='790' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-42'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-53'/>
+      <parameter type-id='type-id-44'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-58'/>
     </function-decl>
     <function-decl name='lldiv' filepath='/usr/include/stdlib.h' line='796' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-43'/>
-      <parameter type-id='type-id-43'/>
-      <return type-id='type-id-55'/>
+      <parameter type-id='type-id-45'/>
+      <parameter type-id='type-id-45'/>
+      <return type-id='type-id-60'/>
     </function-decl>
     <function-decl name='mblen' filepath='/usr/include/stdlib.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='mbtowc' filepath='/usr/include/stdlib.h' line='865' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wctomb' filepath='/usr/include/stdlib.h' line='869' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-192'/>
-      <parameter type-id='type-id-112'/>
+      <parameter type-id='type-id-205'/>
+      <parameter type-id='type-id-125'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='873' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcstombs' filepath='/usr/include/stdlib.h' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='memcpy' filepath='/usr/include/string.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2669'/>
-      <parameter type-id='type-id-2670'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-2691'/>
+      <parameter type-id='type-id-2692'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='memmove' filepath='/usr/include/string.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='memset' filepath='/usr/include/string.h' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='memcmp' filepath='/usr/include/string.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='memchr' filepath='/usr/include/string.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-52'/>
+      <parameter type-id='type-id-57'/>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-52'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-57'/>
     </function-decl>
     <function-decl name='strcpy' filepath='/usr/include/string.h' line='129' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='strncpy' filepath='/usr/include/string.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='strcat' filepath='/usr/include/string.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='strncat' filepath='/usr/include/string.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='strcmp' filepath='/usr/include/string.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='strncmp' filepath='/usr/include/string.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='strcoll' filepath='/usr/include/string.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='strxfrm' filepath='/usr/include/string.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='strchr' filepath='/usr/include/string.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-58'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <function-decl name='strrchr' filepath='/usr/include/string.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-58'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='strspn' filepath='/usr/include/string.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='strpbrk' filepath='/usr/include/string.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <function-decl name='strstr' filepath='/usr/include/string.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <function-decl name='strtok' filepath='/usr/include/string.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-271'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-284'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='strlen' filepath='/usr/include/string.h' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='strerror' filepath='/usr/include/string.h' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-192'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='clock' filepath='/usr/include/time.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-78'/>
+      <return type-id='type-id-83'/>
     </function-decl>
     <function-decl name='time' filepath='/usr/include/time.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2444'/>
-      <return type-id='type-id-94'/>
+      <parameter type-id='type-id-2463'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='difftime' filepath='/usr/include/time.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-94'/>
-      <parameter type-id='type-id-94'/>
+      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-99'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='mktime' filepath='/usr/include/time.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2445'/>
-      <return type-id='type-id-94'/>
+      <parameter type-id='type-id-2464'/>
+      <return type-id='type-id-99'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-1329'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-1341'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1326'/>
-      <return type-id='type-id-2445'/>
+      <parameter type-id='type-id-1338'/>
+      <return type-id='type-id-2464'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1326'/>
-      <return type-id='type-id-2445'/>
+      <parameter type-id='type-id-1338'/>
+      <return type-id='type-id-2464'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1328'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-1340'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1326'/>
-      <return type-id='type-id-192'/>
+      <parameter type-id='type-id-1338'/>
+      <return type-id='type-id-205'/>
     </function-decl>
     <function-decl name='wcscpy' filepath='/usr/include/wchar.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcsncpy' filepath='/usr/include/wchar.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcscat' filepath='/usr/include/wchar.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcsncat' filepath='/usr/include/wchar.h' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcscmp' filepath='/usr/include/wchar.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wcsncmp' filepath='/usr/include/wchar.h' line='166' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wcscoll' filepath='/usr/include/wchar.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wcsxfrm' filepath='/usr/include/wchar.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcschr' filepath='/usr/include/wchar.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-112'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-125'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcsrchr' filepath='/usr/include/wchar.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-112'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-125'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcscspn' filepath='/usr/include/wchar.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcsspn' filepath='/usr/include/wchar.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcspbrk' filepath='/usr/include/wchar.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcsstr' filepath='/usr/include/wchar.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcstok' filepath='/usr/include/wchar.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wcslen' filepath='/usr/include/wchar.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-1406'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wmemchr' filepath='/usr/include/wchar.h' line='320' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wmemcmp' filepath='/usr/include/wchar.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-92'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-97'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wmemcpy' filepath='/usr/include/wchar.h' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wmemmove' filepath='/usr/include/wchar.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2503'/>
-      <parameter type-id='type-id-1394'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2524'/>
+      <parameter type-id='type-id-1406'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='wmemset' filepath='/usr/include/wchar.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2503'/>
-      <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-92'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2524'/>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-97'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='btowc' filepath='/usr/include/wchar.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='wctob' filepath='/usr/include/wchar.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='mbsinit' filepath='/usr/include/wchar.h' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-289'/>
+      <parameter type-id='type-id-302'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1407'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1419'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcrtomb' filepath='/usr/include/wchar.h' line='370' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-1407'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-1419'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='mbrlen' filepath='/usr/include/wchar.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-271'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1407'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1419'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='mbsrtowcs' filepath='/usr/include/wchar.h' line='408' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-274'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1407'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-287'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1419'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcsrtombs' filepath='/usr/include/wchar.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-1397'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1407'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-1409'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1419'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='wcstod' filepath='/usr/include/wchar.h' line='450' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='wcstof' filepath='/usr/include/wchar.h' line='457' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='wcstold' filepath='/usr/include/wchar.h' line='459' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='wcstol' filepath='/usr/include/wchar.h' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='wcstoul' filepath='/usr/include/wchar.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-91'/>
+      <return type-id='type-id-96'/>
     </function-decl>
     <function-decl name='wcstoll' filepath='/usr/include/wchar.h' line='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='wcstoull' filepath='/usr/include/wchar.h' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2506'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2527'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-102'/>
+      <return type-id='type-id-107'/>
     </function-decl>
     <function-decl name='fwide' filepath='/usr/include/wchar.h' line='587' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2511'/>
+      <parameter type-id='type-id-2532'/>
       <parameter type-id='type-id-40'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fwprintf' filepath='/usr/include/wchar.h' line='594' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2512'/>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-2533'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wprintf' filepath='/usr/include/wchar.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='swprintf' filepath='/usr/include/wchar.h' line='604' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vfwprintf' filepath='/usr/include/wchar.h' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2512'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-2533'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vwprintf' filepath='/usr/include/wchar.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vswprintf' filepath='/usr/include/wchar.h' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fwscanf' filepath='/usr/include/wchar.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2512'/>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-2533'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wscanf' filepath='/usr/include/wchar.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='swscanf' filepath='/usr/include/wchar.h' line='645' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-1395'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-1407'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vfwscanf' filepath='/usr/include/wchar.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2512'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-2533'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vwscanf' filepath='/usr/include/wchar.h' line='697' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='vswscanf' filepath='/usr/include/wchar.h' line='701' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-142'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='fgetwc' filepath='/usr/include/wchar.h' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2511'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-2532'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='getwc' filepath='/usr/include/wchar.h' line='746' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2511'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-2532'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='getwchar' filepath='/usr/include/wchar.h' line='752' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-100'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='fputwc' filepath='/usr/include/wchar.h' line='759' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-2511'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-2532'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='putwc' filepath='/usr/include/wchar.h' line='760' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-112'/>
-      <parameter type-id='type-id-2511'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-125'/>
+      <parameter type-id='type-id-2532'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='putwchar' filepath='/usr/include/wchar.h' line='766' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-112'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-125'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='fgetws' filepath='/usr/include/wchar.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
+      <parameter type-id='type-id-2525'/>
       <parameter type-id='type-id-40'/>
-      <parameter type-id='type-id-2512'/>
-      <return type-id='type-id-2503'/>
+      <parameter type-id='type-id-2533'/>
+      <return type-id='type-id-2524'/>
     </function-decl>
     <function-decl name='fputws' filepath='/usr/include/wchar.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-2512'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-2533'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='ungetwc' filepath='/usr/include/wchar.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-2511'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-2532'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='855' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2504'/>
-      <parameter type-id='type-id-92'/>
-      <parameter type-id='type-id-1395'/>
-      <parameter type-id='type-id-1329'/>
-      <return type-id='type-id-92'/>
+      <parameter type-id='type-id-2525'/>
+      <parameter type-id='type-id-97'/>
+      <parameter type-id='type-id-1407'/>
+      <parameter type-id='type-id-1341'/>
+      <return type-id='type-id-97'/>
     </function-decl>
     <function-decl name='iswalnum' filepath='/usr/include/wctype.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswalpha' filepath='/usr/include/wctype.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswcntrl' filepath='/usr/include/wctype.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswdigit' filepath='/usr/include/wctype.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswgraph' filepath='/usr/include/wctype.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswlower' filepath='/usr/include/wctype.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswprint' filepath='/usr/include/wctype.h' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswpunct' filepath='/usr/include/wctype.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswspace' filepath='/usr/include/wctype.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswupper' filepath='/usr/include/wctype.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswxdigit' filepath='/usr/include/wctype.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='iswblank' filepath='/usr/include/wctype.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='wctype' filepath='/usr/include/wctype.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-99'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='iswctype' filepath='/usr/include/wctype.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-99'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-104'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='towlower' filepath='/usr/include/wctype.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='towupper' filepath='/usr/include/wctype.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='wctrans' filepath='/usr/include/wctype.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-98'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='towctrans' filepath='/usr/include/wctype.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-100'/>
-      <parameter type-id='type-id-98'/>
-      <return type-id='type-id-100'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-103'/>
+      <return type-id='type-id-105'/>
     </function-decl>
     <function-decl name='acos' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19849,8 +19909,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='acoshl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='asinh' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19861,8 +19921,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='asinhl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='atanh' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19873,8 +19933,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='atanhl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='exp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19882,7 +19942,7 @@
     </function-decl>
     <function-decl name='frexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-1404'/>
+      <parameter type-id='type-id-1416'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='ldexp' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19900,7 +19960,7 @@
     </function-decl>
     <function-decl name='modf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-1399'/>
+      <parameter type-id='type-id-1411'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='expm1' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19912,8 +19972,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='expm1l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='log1p' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19924,8 +19984,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='log1pl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='logb' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19936,8 +19996,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='logbl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='exp2' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19948,8 +20008,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='exp2l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='log2' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19960,8 +20020,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='log2l' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='pow' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19983,9 +20043,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='hypotl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='cbrt' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -19996,8 +20056,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='cbrtl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='ceil' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20027,21 +20087,21 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='copysignl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='nan' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='nanf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
+      <parameter type-id='type-id-63'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='nanl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-58'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-63'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='erf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20052,8 +20112,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='erfl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='erfc' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20064,8 +20124,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='erfcl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='lgamma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20076,8 +20136,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='lgammal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='tgamma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20088,8 +20148,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='tgammal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='rint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20100,8 +20160,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='rintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='nextafter' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20114,24 +20174,24 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='nextafterl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='nexttoward' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='nexttowardf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='nexttowardl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='remainder' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20144,9 +20204,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='remainderl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='scalbn' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20159,9 +20219,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='scalbnl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
       <parameter type-id='type-id-40'/>
-      <return type-id='type-id-41'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='ilogb' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20172,23 +20232,23 @@
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='ilogbl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
       <return type-id='type-id-40'/>
     </function-decl>
     <function-decl name='scalbln' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-44'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='scalblnf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-42'/>
+      <parameter type-id='type-id-44'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='scalblnl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-42'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-44'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='nearbyint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20199,8 +20259,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='nearbyintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='305' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='round' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20211,8 +20271,8 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='roundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='trunc' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20223,74 +20283,74 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='truncl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='remquo' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-1404'/>
+      <parameter type-id='type-id-1416'/>
       <return type-id='type-id-38'/>
     </function-decl>
     <function-decl name='remquof' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
       <parameter type-id='type-id-39'/>
-      <parameter type-id='type-id-1404'/>
+      <parameter type-id='type-id-1416'/>
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='remquol' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-1404'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-1416'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='lrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='lrintf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='lrintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='llrint' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='llrintf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='llrintl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='lround' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='lroundf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-42'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='lroundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-42'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-44'/>
     </function-decl>
     <function-decl name='llround' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='llroundf' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-39'/>
-      <return type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='llroundl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-45'/>
     </function-decl>
     <function-decl name='fdim' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20303,9 +20363,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='fdiml' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fmax' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20318,9 +20378,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='fmaxl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='340' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fmin' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20333,9 +20393,9 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='fminl' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <function-decl name='fma' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
@@ -20350,68 +20410,68 @@
       <return type-id='type-id-39'/>
     </function-decl>
     <function-decl name='fmal' filepath='/usr/include/x86_64-linux-gnu/bits/mathcalls.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <parameter type-id='type-id-41'/>
-      <return type-id='type-id-41'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <parameter type-id='type-id-43'/>
+      <return type-id='type-id-43'/>
     </function-decl>
     <namespace-decl name='mongo'>
-      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-290'>
+      <class-decl name='AtomicWord&lt;unsigned int&gt;' size-in-bits='32' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='40' column='1' id='type-id-303'>
         <member-type access='private'>
-          <typedef-decl name='WordType' type-id='type-id-48' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-3318'/>
+          <typedef-decl name='WordType' type-id='type-id-53' filepath='src/mongo/platform/atomic_word.h' line='45' column='1' id='type-id-3343'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_value' type-id='type-id-1075' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
+          <var-decl name='_value' type-id='type-id-1087' visibility='default' filepath='src/mongo/platform/atomic_word.h' line='149' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='subtractAndFetch' mangled-name='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj' filepath='src/mongo/platform/atomic_word.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16subtractAndFetchEj'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-3318'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-3343'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndSubtract' mangled-name='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj' filepath='src/mongo/platform/atomic_word.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE16fetchAndSubtractEj'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-3318'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-3343'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='fetchAndAdd' mangled-name='_ZN5mongo10AtomicWordIjE11fetchAndAddEj' filepath='src/mongo/platform/atomic_word.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10AtomicWordIjE11fetchAndAddEj'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-3318'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-3343'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='AtomicWord' filepath='src/mongo/platform/atomic_word.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1408' is-artificial='yes'/>
-            <parameter type-id='type-id-3318'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1420' is-artificial='yes'/>
+            <parameter type-id='type-id-3343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-293'>
+      <class-decl name='BSONElement' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='72' column='1' id='type-id-306'>
         <member-type access='private'>
-          <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-3319'/>
+          <class-decl name='FieldNameSizeTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='598' column='1' id='type-id-3344'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='data' type-id='type-id-58' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='617' column='1'/>
+          <var-decl name='data' type-id='type-id-63' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='617' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='fieldNameSize_' type-id='type-id-40' visibility='default' filepath='src/mongo/bson/bsonelement.h' line='618' column='1'/>
@@ -20421,504 +20481,504 @@
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-3319'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3344'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-3319'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3344'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='589' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONElement' filepath='src/mongo/bson/bsonelement.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1410' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
+            <parameter type-id='type-id-1422' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-3319'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3344'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-297'>
+      <class-decl name='BSONObj' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='94' column='1' id='type-id-310'>
         <member-type access='private'>
-          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2519'/>
+          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2540'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3320'/>
+          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3345'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3321'/>
+          <class-decl name='SorterDeserializeSettings' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3346'/>
         </member-type>
         <data-member access='public' static='yes'>
           <var-decl name='kMinBSONLength' type-id='type-id-29' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='96' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_objdata' type-id='type-id-58' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='600' column='1'/>
+          <var-decl name='_objdata' type-id='type-id-63' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='600' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_ownedBuffer' type-id='type-id-347' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
+          <var-decl name='_ownedBuffer' type-id='type-id-360' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='601' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2Ev' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2Ev'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-347'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2EOS0_' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2EOS0_'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1412'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7BSONObjC2ERKS0_'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOwned' mangled-name='_ZNK5mongo7BSONObj7isOwnedEv' filepath='src/mongo/bson/bsonobj.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo7BSONObj7isOwnedEv'>
-            <parameter type-id='type-id-300' is-artificial='yes'/>
+            <parameter type-id='type-id-313' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-347'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1412'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-347'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-360'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-1412'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1424'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObj' filepath='src/mongo/bson/bsonobj.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1413' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BSONObjIterator' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='632' column='1' id='type-id-301'>
+      <class-decl name='BSONObjIterator' size-in-bits='128' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='632' column='1' id='type-id-314'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_pos' type-id='type-id-58' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='723' column='1'/>
+          <var-decl name='_pos' type-id='type-id-63' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='723' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_theend' type-id='type-id-58' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='724' column='1'/>
+          <var-decl name='_theend' type-id='type-id-63' visibility='default' filepath='src/mongo/bson/bsonobj.h' line='724' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='636' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-299'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-312'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BSONObjIterator' filepath='src/mongo/bson/bsonobj.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1415' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1427' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='BufReader' size-in-bits='192' visibility='default' filepath='src/mongo/util/bufreader.h' line='42' column='1' id='type-id-304'>
+      <class-decl name='BufReader' size-in-bits='192' visibility='default' filepath='src/mongo/util/bufreader.h' line='42' column='1' id='type-id-317'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_start' type-id='type-id-52' visibility='default' filepath='src/mongo/util/bufreader.h' line='145' column='1'/>
+          <var-decl name='_start' type-id='type-id-57' visibility='default' filepath='src/mongo/util/bufreader.h' line='145' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_pos' type-id='type-id-52' visibility='default' filepath='src/mongo/util/bufreader.h' line='146' column='1'/>
+          <var-decl name='_pos' type-id='type-id-57' visibility='default' filepath='src/mongo/util/bufreader.h' line='146' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_end' type-id='type-id-52' visibility='default' filepath='src/mongo/util/bufreader.h' line='147' column='1'/>
+          <var-decl name='_end' type-id='type-id-57' visibility='default' filepath='src/mongo/util/bufreader.h' line='147' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-306'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-319'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-57'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-306'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-319'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-57'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-306'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-319'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='BufReader' filepath='src/mongo/util/bufreader.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1419' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-57'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-308'>
+      <class-decl name='ConstDataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='39' column='1' id='type-id-321'>
         <member-type access='private'>
-          <typedef-decl name='bytes_type' type-id='type-id-58' filepath='src/mongo/base/data_view.h' line='41' column='1' id='type-id-3322'/>
+          <typedef-decl name='bytes_type' type-id='type-id-63' filepath='src/mongo/base/data_view.h' line='41' column='1' id='type-id-3347'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_bytes' type-id='type-id-3322' visibility='default' filepath='src/mongo/base/data_view.h' line='66' column='1'/>
+          <var-decl name='_bytes' type-id='type-id-3347' visibility='default' filepath='src/mongo/base/data_view.h' line='66' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
-            <parameter type-id='type-id-3322'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-3347'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
-            <parameter type-id='type-id-3322'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-3347'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ConstDataView' filepath='src/mongo/base/data_view.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1420' is-artificial='yes'/>
-            <parameter type-id='type-id-3322'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1432' is-artificial='yes'/>
+            <parameter type-id='type-id-3347'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-311'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-308'/>
+      <class-decl name='DataView' size-in-bits='64' visibility='default' filepath='src/mongo/base/data_view.h' line='69' column='1' id='type-id-324'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-321'/>
         <member-type access='private'>
-          <typedef-decl name='bytes_type' type-id='type-id-192' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-3323'/>
+          <typedef-decl name='bytes_type' type-id='type-id-205' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-3348'/>
         </member-type>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-3323'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-3348'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-3323'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-3348'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='DataView' filepath='src/mongo/base/data_view.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1421' is-artificial='yes'/>
-            <parameter type-id='type-id-3323'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1433' is-artificial='yes'/>
+            <parameter type-id='type-id-3348'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Date_t' size-in-bits='64' visibility='default' filepath='src/mongo/util/time_support.h' line='95' column='1' id='type-id-314'>
+      <class-decl name='Date_t' size-in-bits='64' visibility='default' filepath='src/mongo/util/time_support.h' line='95' column='1' id='type-id-327'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='millis' type-id='type-id-43' visibility='default' filepath='src/mongo/util/time_support.h' line='259' column='1'/>
+          <var-decl name='millis' type-id='type-id-45' visibility='default' filepath='src/mongo/util/time_support.h' line='259' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' mangled-name='_ZN5mongo6Date_tC2Ev' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Date_tC2Ev'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-1078'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt; &gt;' mangled-name='_ZNK5mongo6Date_tplINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEES0_T_' filepath='src/mongo/util/time_support.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_tplINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEES0_T_'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <parameter type-id='type-id-1085'/>
-            <return type-id='type-id-314'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <parameter type-id='type-id-1097'/>
+            <return type-id='type-id-327'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;=' mangled-name='_ZNK5mongo6Date_tleES0_' filepath='src/mongo/util/time_support.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_tleES0_'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNK5mongo6Date_teqES0_' filepath='src/mongo/util/time_support.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_teqES0_'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+=&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000&gt; &gt; &gt;' mangled-name='_ZN5mongo6Date_tpLINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEERS0_T_' filepath='src/mongo/util/time_support.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Date_tpLINSt6chrono8durationIlSt5ratioILl1ELl1000EEEEEERS0_T_'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-1085'/>
-            <return type-id='type-id-1422'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1097'/>
+            <return type-id='type-id-1434'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='toDurationSinceEpoch' mangled-name='_ZNK5mongo6Date_t20toDurationSinceEpochEv' filepath='src/mongo/util/time_support.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_t20toDurationSinceEpochEv'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <return type-id='type-id-327'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <return type-id='type-id-340'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='toMillisSinceEpoch' mangled-name='_ZNK5mongo6Date_t18toMillisSinceEpochEv' filepath='src/mongo/util/time_support.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_t18toMillisSinceEpochEv'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <return type-id='type-id-43'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <return type-id='type-id-45'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&gt;' mangled-name='_ZNK5mongo6Date_tgtES0_' filepath='src/mongo/util/time_support.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Date_tgtES0_'>
-            <parameter type-id='type-id-316' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
+            <parameter type-id='type-id-329' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-1078'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-1078'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-1090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Date_t' filepath='src/mongo/util/time_support.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1423' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1435' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-317'>
+      <class-decl name='Decimal128' size-in-bits='128' visibility='default' filepath='src/mongo/platform/decimal128.h' line='47' column='1' id='type-id-330'>
         <member-type access='private'>
-          <enum-decl name='RoundingMode' filepath='src/mongo/platform/decimal128.h' line='87' column='1' id='type-id-3324'>
-            <underlying-type type-id='type-id-104'/>
+          <enum-decl name='RoundingMode' filepath='src/mongo/platform/decimal128.h' line='87' column='1' id='type-id-3349'>
+            <underlying-type type-id='type-id-109'/>
             <enumerator name='kRoundTiesToEven' value='0'/>
             <enumerator name='kRoundTowardNegative' value='1'/>
             <enumerator name='kRoundTowardPositive' value='2'/>
@@ -20927,8 +20987,8 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <enum-decl name='SignalingFlag' filepath='src/mongo/platform/decimal128.h' line='108' column='1' id='type-id-3325'>
-            <underlying-type type-id='type-id-104'/>
+          <enum-decl name='SignalingFlag' filepath='src/mongo/platform/decimal128.h' line='108' column='1' id='type-id-3350'>
+            <underlying-type type-id='type-id-109'/>
             <enumerator name='kNoFlag' value='0'/>
             <enumerator name='kInvalid' value='1'/>
             <enumerator name='kDivideByZero' value='4'/>
@@ -20938,182 +20998,182 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='Value' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/platform/decimal128.h' line='82' column='1' id='type-id-3326'>
+          <class-decl name='Value' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/platform/decimal128.h' line='82' column='1' id='type-id-3351'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='low64' type-id='type-id-96' visibility='default' filepath='src/mongo/platform/decimal128.h' line='83' column='1'/>
+              <var-decl name='low64' type-id='type-id-101' visibility='default' filepath='src/mongo/platform/decimal128.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='high64' type-id='type-id-96' visibility='default' filepath='src/mongo/platform/decimal128.h' line='84' column='1'/>
+              <var-decl name='high64' type-id='type-id-101' visibility='default' filepath='src/mongo/platform/decimal128.h' line='84' column='1'/>
             </data-member>
           </class-decl>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='enabled' type-id='type-id-236' visibility='default' filepath='src/mongo/platform/decimal128.h' line='56' column='1'/>
+          <var-decl name='enabled' type-id='type-id-249' visibility='default' filepath='src/mongo/platform/decimal128.h' line='56' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestPositive' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='67' column='1'/>
+          <var-decl name='kLargestPositive' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='67' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kSmallestPositive' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='68' column='1'/>
+          <var-decl name='kSmallestPositive' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='68' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestNegative' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='69' column='1'/>
+          <var-decl name='kLargestNegative' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='69' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kSmallestNegative' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='70' column='1'/>
+          <var-decl name='kSmallestNegative' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='70' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kLargestNegativeExponentZero' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='72' column='1'/>
+          <var-decl name='kLargestNegativeExponentZero' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='72' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kPositiveInfinity' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='74' column='1'/>
+          <var-decl name='kPositiveInfinity' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='74' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kNegativeInfinity' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='75' column='1'/>
+          <var-decl name='kNegativeInfinity' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='75' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kPositiveNaN' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='76' column='1'/>
+          <var-decl name='kPositiveNaN' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='kNegativeNaN' type-id='type-id-318' visibility='default' filepath='src/mongo/platform/decimal128.h' line='77' column='1'/>
+          <var-decl name='kNegativeNaN' type-id='type-id-331' visibility='default' filepath='src/mongo/platform/decimal128.h' line='77' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_value' type-id='type-id-3326' visibility='default' filepath='src/mongo/platform/decimal128.h' line='306' column='1'/>
+          <var-decl name='_value' type-id='type-id-3351' visibility='default' filepath='src/mongo/platform/decimal128.h' line='306' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-3326'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-3351'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-86'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-2552'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-2573'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-3326'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-3351'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-86'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-3327'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-3352'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-3326'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-3351'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-86'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-43'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-45'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
             <parameter type-id='type-id-38'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Decimal128' filepath='src/mongo/platform/decimal128.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1425' is-artificial='yes'/>
-            <parameter type-id='type-id-3328'/>
-            <parameter type-id='type-id-3324'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1437' is-artificial='yes'/>
+            <parameter type-id='type-id-3353'/>
+            <parameter type-id='type-id-3349'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ErrorCodes' size-in-bits='8' visibility='default' filepath='build/debug/mongo/base/error_codes.h' line='39' column='1' id='type-id-3329'>
+      <class-decl name='ErrorCodes' size-in-bits='8' visibility='default' filepath='build/debug/mongo/base/error_codes.h' line='39' column='1' id='type-id-3354'>
         <member-type access='private'>
-          <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='41' column='1' id='type-id-321'>
-            <underlying-type type-id='type-id-104'/>
+          <enum-decl name='Error' filepath='build/debug/mongo/base/error_codes.h' line='41' column='1' id='type-id-334'>
+            <underlying-type type-id='type-id-109'/>
             <enumerator name='OK' value='0'/>
             <enumerator name='InternalError' value='1'/>
             <enumerator name='BadValue' value='2'/>
@@ -21276,1249 +21336,1249 @@
           </enum-decl>
         </member-type>
       </class-decl>
-      <class-decl name='NamespaceString' size-in-bits='128' visibility='default' filepath='src/mongo/db/namespace_string.h' line='55' column='1' id='type-id-329'>
+      <class-decl name='NamespaceString' size-in-bits='128' visibility='default' filepath='src/mongo/db/namespace_string.h' line='55' column='1' id='type-id-342'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_ns' type-id='type-id-2552' visibility='default' filepath='src/mongo/db/namespace_string.h' line='268' column='1'/>
+          <var-decl name='_ns' type-id='type-id-2573' visibility='default' filepath='src/mongo/db/namespace_string.h' line='268' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_dotIndex' type-id='type-id-92' visibility='default' filepath='src/mongo/db/namespace_string.h' line='269' column='1'/>
+          <var-decl name='_dotIndex' type-id='type-id-97' visibility='default' filepath='src/mongo/db/namespace_string.h' line='269' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' mangled-name='_ZN5mongo15NamespaceStringC2Ev' filepath='src/mongo/db/namespace_string.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15NamespaceStringC2Ev'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' filepath='src/mongo/db/namespace_string.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='NamespaceString' filepath='src/mongo/db/namespace_string.h' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1427' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1439' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='ns' mangled-name='_ZNK5mongo15NamespaceString2nsEv' filepath='src/mongo/db/namespace_string.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo15NamespaceString2nsEv'>
-            <parameter type-id='type-id-332' is-artificial='yes'/>
-            <return type-id='type-id-2554'/>
+            <parameter type-id='type-id-345' is-artificial='yes'/>
+            <return type-id='type-id-2575'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-333'>
+      <class-decl name='OID' size-in-bits='96' visibility='default' filepath='src/mongo/bson/oid.h' line='71' column='1' id='type-id-346'>
         <member-type access='private'>
-          <class-decl name='no_initialize_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='207' column='1' id='type-id-3330'/>
+          <class-decl name='no_initialize_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/bson/oid.h' line='207' column='1' id='type-id-3355'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='Timestamp' type-id='type-id-81' filepath='src/mongo/bson/oid.h' line='173' column='1' id='type-id-3331'/>
+          <typedef-decl name='Timestamp' type-id='type-id-86' filepath='src/mongo/bson/oid.h' line='173' column='1' id='type-id-3356'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3332'/>
+          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3357'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3333'/>
+          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3358'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3334'/>
+          <class-decl name='Increment' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3359'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3335'/>
+          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3360'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3336'/>
+          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3361'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3337'/>
+          <class-decl name='InstanceUnique' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3362'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_data' type-id='type-id-6' visibility='default' filepath='src/mongo/bson/oid.h' line='210' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-82'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-87'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-3330'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-3355'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-82'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-87'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-3330'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-3355'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-1331'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-1343'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-82'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-87'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='OID' filepath='src/mongo/bson/oid.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1429' is-artificial='yes'/>
-            <parameter type-id='type-id-3330'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1441' is-artificial='yes'/>
+            <parameter type-id='type-id-3355'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OldThreadPool' size-in-bits='2432' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='44' column='1' id='type-id-337'>
+      <class-decl name='OldThreadPool' size-in-bits='2432' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='44' column='1' id='type-id-350'>
         <member-type access='private'>
-          <class-decl name='DoNotStartThreadsTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='49' column='1' id='type-id-340'/>
+          <class-decl name='DoNotStartThreadsTag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='49' column='1' id='type-id-353'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='Task' type-id='type-id-1133' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='48' column='1' id='type-id-3338'/>
+          <typedef-decl name='Task' type-id='type-id-1145' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='48' column='1' id='type-id-3363'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_pool' type-id='type-id-3339' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='92' column='1'/>
+          <var-decl name='_pool' type-id='type-id-3364' visibility='default' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='92' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
-            <parameter type-id='type-id-339'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-352'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
+            <parameter type-id='type-id-1443' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='OldThreadPool' filepath='src/mongo/util/concurrency/old_thread_pool.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1431' is-artificial='yes'/>
-            <parameter type-id='type-id-342'/>
+            <parameter type-id='type-id-1443' is-artificial='yes'/>
+            <parameter type-id='type-id-355'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Ordering' size-in-bits='32' visibility='default' filepath='src/mongo/bson/ordering.h' line='43' column='1' id='type-id-343'>
+      <class-decl name='Ordering' size-in-bits='32' visibility='default' filepath='src/mongo/bson/ordering.h' line='43' column='1' id='type-id-356'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='bits' type-id='type-id-48' visibility='default' filepath='src/mongo/bson/ordering.h' line='44' column='1'/>
+          <var-decl name='bits' type-id='type-id-53' visibility='default' filepath='src/mongo/bson/ordering.h' line='44' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-345'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-358'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-345'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-358'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Ordering' filepath='src/mongo/bson/ordering.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1434' is-artificial='yes'/>
-            <parameter type-id='type-id-345'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1447' is-artificial='yes'/>
+            <parameter type-id='type-id-358'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='PseudoRandom' size-in-bits='128' visibility='default' filepath='src/mongo/platform/random.h' line='39' column='1' id='type-id-1435'>
+      <class-decl name='PseudoRandom' size-in-bits='128' visibility='default' filepath='src/mongo/platform/random.h' line='39' column='1' id='type-id-1448'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_x' type-id='type-id-81' visibility='default' filepath='src/mongo/platform/random.h' line='77' column='1'/>
+          <var-decl name='_x' type-id='type-id-86' visibility='default' filepath='src/mongo/platform/random.h' line='77' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='32'>
-          <var-decl name='_y' type-id='type-id-81' visibility='default' filepath='src/mongo/platform/random.h' line='78' column='1'/>
+          <var-decl name='_y' type-id='type-id-86' visibility='default' filepath='src/mongo/platform/random.h' line='78' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_z' type-id='type-id-81' visibility='default' filepath='src/mongo/platform/random.h' line='79' column='1'/>
+          <var-decl name='_z' type-id='type-id-86' visibility='default' filepath='src/mongo/platform/random.h' line='79' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='96'>
-          <var-decl name='_w' type-id='type-id-81' visibility='default' filepath='src/mongo/platform/random.h' line='80' column='1'/>
+          <var-decl name='_w' type-id='type-id-86' visibility='default' filepath='src/mongo/platform/random.h' line='80' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-81'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-86'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-95'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-100'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='PseudoRandom' filepath='src/mongo/platform/random.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-82'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-87'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='nextInt64' mangled-name='_ZN5mongo12PseudoRandom9nextInt64El' filepath='src/mongo/platform/random.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12PseudoRandom9nextInt64El'>
-            <parameter type-id='type-id-1436' is-artificial='yes'/>
-            <parameter type-id='type-id-82'/>
-            <return type-id='type-id-82'/>
+            <parameter type-id='type-id-1449' is-artificial='yes'/>
+            <parameter type-id='type-id-87'/>
+            <return type-id='type-id-87'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-347'>
+      <class-decl name='SharedBuffer' size-in-bits='64' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='37' column='1' id='type-id-360'>
         <member-type access='private'>
-          <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-351'>
+          <class-decl name='Holder' size-in-bits='32' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='83' column='1' id='type-id-364'>
             <data-member access='private' layout-offset-in-bits='0'>
-              <var-decl name='_refCount' type-id='type-id-3340' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='111' column='1'/>
+              <var-decl name='_refCount' type-id='type-id-3365' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='111' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1441' is-artificial='yes'/>
-                <parameter type-id='type-id-3318'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1454' is-artificial='yes'/>
+                <parameter type-id='type-id-3343'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='data' mangled-name='_ZN5mongo12SharedBuffer6Holder4dataEv' filepath='src/mongo/util/shared_buffer.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBuffer6Holder4dataEv'>
-                <parameter type-id='type-id-1441' is-artificial='yes'/>
-                <return type-id='type-id-192'/>
+                <parameter type-id='type-id-1454' is-artificial='yes'/>
+                <return type-id='type-id-205'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1441' is-artificial='yes'/>
-                <parameter type-id='type-id-3318'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1454' is-artificial='yes'/>
+                <parameter type-id='type-id-3343'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='Holder' filepath='src/mongo/util/shared_buffer.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1441' is-artificial='yes'/>
-                <parameter type-id='type-id-3318'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-1454' is-artificial='yes'/>
+                <parameter type-id='type-id-3343'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_holder' type-id='type-id-147' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='120' column='1'/>
+          <var-decl name='_holder' type-id='type-id-160' visibility='default' filepath='src/mongo/util/shared_buffer.h' line='120' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2Ev'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2ERKS0_' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2ERKS0_'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-349'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-362'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' mangled-name='_ZN5mongo12SharedBufferC2EOS0_' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBufferC2EOS0_'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1438'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1451'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1441'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1454'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5mongo12SharedBuffer3getEv' filepath='src/mongo/util/shared_buffer.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo12SharedBuffer3getEv'>
-            <parameter type-id='type-id-350' is-artificial='yes'/>
-            <return type-id='type-id-192'/>
+            <parameter type-id='type-id-363' is-artificial='yes'/>
+            <return type-id='type-id-205'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5mongo12SharedBuffer4swapERS0_' filepath='src/mongo/util/shared_buffer.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12SharedBuffer4swapERS0_'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1437'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1450'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-349'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-362'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1438'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1451'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1441'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1454'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='39' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-349'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-362'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1438'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1451'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='SharedBuffer' filepath='src/mongo/util/shared_buffer.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1439' is-artificial='yes'/>
-            <parameter type-id='type-id-1441'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1452' is-artificial='yes'/>
+            <parameter type-id='type-id-1454'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-354'>
+      <class-decl name='Status' size-in-bits='64' visibility='default' filepath='src/mongo/base/status.h' line='62' column='1' id='type-id-367'>
         <member-type access='private'>
-          <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1445'>
+          <class-decl name='ErrorInfo' size-in-bits='192' is-struct='yes' visibility='default' filepath='src/mongo/base/status.h' line='123' column='1' id='type-id-1458'>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='refs' type-id='type-id-3340' visibility='default' filepath='src/mongo/base/status.h' line='124' column='1'/>
+              <var-decl name='refs' type-id='type-id-3365' visibility='default' filepath='src/mongo/base/status.h' line='124' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='32'>
-              <var-decl name='code' type-id='type-id-322' visibility='default' filepath='src/mongo/base/status.h' line='125' column='1'/>
+              <var-decl name='code' type-id='type-id-335' visibility='default' filepath='src/mongo/base/status.h' line='125' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='reason' type-id='type-id-2553' visibility='default' filepath='src/mongo/base/status.h' line='126' column='1'/>
+              <var-decl name='reason' type-id='type-id-2574' visibility='default' filepath='src/mongo/base/status.h' line='126' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='location' type-id='type-id-283' visibility='default' filepath='src/mongo/base/status.h' line='127' column='1'/>
+              <var-decl name='location' type-id='type-id-296' visibility='default' filepath='src/mongo/base/status.h' line='127' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='ErrorInfo' filepath='src/mongo/base/status.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1446' is-artificial='yes'/>
-                <parameter type-id='type-id-321'/>
-                <parameter type-id='type-id-2552'/>
+                <parameter type-id='type-id-1459' is-artificial='yes'/>
+                <parameter type-id='type-id-334'/>
+                <parameter type-id='type-id-2573'/>
                 <parameter type-id='type-id-40'/>
-                <return type-id='type-id-2675'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='ErrorInfo' filepath='src/mongo/base/status.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-1446' is-artificial='yes'/>
-                <parameter type-id='type-id-321'/>
-                <parameter type-id='type-id-3328'/>
+                <parameter type-id='type-id-1459' is-artificial='yes'/>
+                <parameter type-id='type-id-334'/>
+                <parameter type-id='type-id-3353'/>
                 <parameter type-id='type-id-40'/>
-                <return type-id='type-id-2675'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_error' type-id='type-id-1446' visibility='default' filepath='src/mongo/base/status.h' line='134' column='1'/>
+          <var-decl name='_error' type-id='type-id-1459' visibility='default' filepath='src/mongo/base/status.h' line='134' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-2552'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-2573'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2ERKS0_'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2EOS0_' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2EOS0_'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1456'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' mangled-name='_ZN5mongo6StatusD2Ev' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusD2Ev'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2Ev' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusC2Ev'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='OK' mangled-name='_ZN5mongo6Status2OKEv' filepath='src/mongo/base/status.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status2OKEv'>
-            <return type-id='type-id-354'/>
+            <return type-id='type-id-367'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo6Status4isOKEv' filepath='src/mongo/base/status.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Status4isOKEv'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
+            <parameter type-id='type-id-370' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='code' mangled-name='_ZNK5mongo6Status4codeEv' filepath='src/mongo/base/status.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo6Status4codeEv'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
-            <return type-id='type-id-321'/>
+            <parameter type-id='type-id-370' is-artificial='yes'/>
+            <return type-id='type-id-334'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unref' mangled-name='_ZN5mongo6Status5unrefEPNS0_9ErrorInfoE' filepath='src/mongo/base/status.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status5unrefEPNS0_9ErrorInfoE'>
-            <parameter type-id='type-id-1446'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='ref' mangled-name='_ZN5mongo6Status3refEPNS0_9ErrorInfoE' filepath='src/mongo/base/status.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6Status3refEPNS0_9ErrorInfoE'>
-            <parameter type-id='type-id-1446'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1459'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3327'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3352'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1456'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3328'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3353'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-369'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1456'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~Status' filepath='src/mongo/base/status.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='Status' filepath='src/mongo/base/status.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5mongo6StatusaSEOS0_' filepath='src/mongo/base/status.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6StatusaSEOS0_'>
-            <parameter type-id='type-id-1444' is-artificial='yes'/>
-            <parameter type-id='type-id-1443'/>
-            <return type-id='type-id-1442'/>
+            <parameter type-id='type-id-1457' is-artificial='yes'/>
+            <parameter type-id='type-id-1456'/>
+            <return type-id='type-id-1455'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='448' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-358'>
+      <class-decl name='StatusWith&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='448' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-371'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_status' type-id='type-id-354' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
+          <var-decl name='_status' type-id='type-id-367' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_t' type-id='type-id-151' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
+          <var-decl name='_t' type-id='type-id-164' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-2552'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-2573'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor21RemoteCommandResponseEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor21RemoteCommandResponseEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-388'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE4isOKEv' filepath='src/mongo/base/status_with.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE4isOKEv'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE8getValueEv' filepath='src/mongo/base/status_with.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE8getValueEv'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
-            <return type-id='type-id-390'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
+            <return type-id='type-id-403'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getStatus' mangled-name='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE9getStatusEv' filepath='src/mongo/base/status_with.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor21RemoteCommandResponseEE9getStatusEv'>
-            <parameter type-id='type-id-361' is-artificial='yes'/>
-            <return type-id='type-id-356'/>
+            <parameter type-id='type-id-374' is-artificial='yes'/>
+            <return type-id='type-id-369'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3327'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3352'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-388'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3328'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3353'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1449' is-artificial='yes'/>
-            <parameter type-id='type-id-388'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1462' is-artificial='yes'/>
+            <parameter type-id='type-id-401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StatusWith&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-362'>
+      <class-decl name='StatusWith&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-375'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_status' type-id='type-id-354' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
+          <var-decl name='_status' type-id='type-id-367' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_t' type-id='type-id-155' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
+          <var-decl name='_t' type-id='type-id-168' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-2552'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-2573'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ES3_' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEEC2ES3_'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-398'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-411'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE4isOKEv' filepath='src/mongo/base/status_with.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE4isOKEv'>
-            <parameter type-id='type-id-364' is-artificial='yes'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3328'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3353'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1450' is-artificial='yes'/>
-            <parameter type-id='type-id-398'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1463' is-artificial='yes'/>
+            <parameter type-id='type-id-411'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getStatus' mangled-name='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE9getStatusEv' filepath='src/mongo/base/status_with.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE9getStatusEv'>
-            <parameter type-id='type-id-364' is-artificial='yes'/>
-            <return type-id='type-id-356'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <return type-id='type-id-369'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv' filepath='src/mongo/base/status_with.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor14CallbackHandleEE8getValueEv'>
-            <parameter type-id='type-id-364' is-artificial='yes'/>
-            <return type-id='type-id-400'/>
+            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <return type-id='type-id-413'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-365'>
+      <class-decl name='StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/base/status_with.h' line='63' column='1' id='type-id-378'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_status' type-id='type-id-354' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
+          <var-decl name='_status' type-id='type-id-367' visibility='default' filepath='src/mongo/base/status_with.h' line='122' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_t' type-id='type-id-159' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
+          <var-decl name='_t' type-id='type-id-172' visibility='default' filepath='src/mongo/base/status_with.h' line='123' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_10ErrorCodes5ErrorESsi' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_10ErrorCodes5ErrorESsi'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-2552'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-2573'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ES3_' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ES3_'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-402'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='isOK' mangled-name='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE4isOKEv' filepath='src/mongo/base/status_with.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE4isOKEv'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
+            <parameter type-id='type-id-380' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getStatus' mangled-name='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE9getStatusEv' filepath='src/mongo/base/status_with.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE9getStatusEv'>
-            <parameter type-id='type-id-367' is-artificial='yes'/>
-            <return type-id='type-id-356'/>
+            <parameter type-id='type-id-380' is-artificial='yes'/>
+            <return type-id='type-id-369'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE8getValueEv' filepath='src/mongo/base/status_with.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEE8getValueEv'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <return type-id='type-id-1474'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <return type-id='type-id-1487'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-321'/>
-            <parameter type-id='type-id-3328'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-334'/>
+            <parameter type-id='type-id-3353'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_6StatusE' filepath='src/mongo/base/status_with.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StatusWithINS_8executor12TaskExecutor11EventHandleEEC2ENS_6StatusE'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-354'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-367'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StatusWith' filepath='src/mongo/base/status_with.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1451' is-artificial='yes'/>
-            <parameter type-id='type-id-402'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1464' is-artificial='yes'/>
+            <parameter type-id='type-id-415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StringBuilderImpl&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='343' column='1' id='type-id-368'>
+      <class-decl name='StringBuilderImpl&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='343' column='1' id='type-id-381'>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_DBL_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='346' column='1'/>
+          <var-decl name='MONGO_DBL_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='346' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S32_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='347' column='1'/>
+          <var-decl name='MONGO_S32_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='347' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_U32_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='348' column='1'/>
+          <var-decl name='MONGO_U32_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='348' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S64_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='349' column='1'/>
+          <var-decl name='MONGO_S64_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='349' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_U64_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='350' column='1'/>
+          <var-decl name='MONGO_U64_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='350' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_S16_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='351' column='1'/>
+          <var-decl name='MONGO_S16_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='351' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='MONGO_PTR_SIZE' type-id='type-id-1210' visibility='default' filepath='src/mongo/bson/util/builder.h' line='352' column='1'/>
+          <var-decl name='MONGO_PTR_SIZE' type-id='type-id-1222' visibility='default' filepath='src/mongo/bson/util/builder.h' line='352' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_buf' type-id='type-id-380' visibility='default' filepath='src/mongo/bson/util/builder.h' line='434' column='1'/>
+          <var-decl name='_buf' type-id='type-id-393' visibility='default' filepath='src/mongo/bson/util/builder.h' line='434' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEEC2Ev' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEEC2Ev'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-370'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-383'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsENS_10StringDataE'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE' filepath='src/mongo/bson/util/builder.h' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE6appendENS_10StringDataE'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi' filepath='src/mongo/bson/util/builder.h' line='359' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEi'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-1454'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;int&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIiEERS2_T_iPKc'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEl' filepath='src/mongo/bson/util/builder.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEl'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-44'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;long&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIlEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMIlEERS2_T_iPKc'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-42'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-44'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEPKc' filepath='src/mongo/bson/util/builder.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEPKc'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEm' filepath='src/mongo/bson/util/builder.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEElsEm'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-91'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-96'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='SBNUM&lt;unsigned long&gt;' mangled-name='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMImEERS2_T_iPKc' filepath='src/mongo/bson/util/builder.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo17StringBuilderImplINS_16TrivialAllocatorEE5SBNUMImEERS2_T_iPKc'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-91'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-96'/>
             <parameter type-id='type-id-40'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-1454'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-1467'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='str' mangled-name='_ZNK5mongo17StringBuilderImplINS_16TrivialAllocatorEE3strEv' filepath='src/mongo/bson/util/builder.h' line='424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo17StringBuilderImplINS_16TrivialAllocatorEE3strEv'>
-            <parameter type-id='type-id-371' is-artificial='yes'/>
-            <return type-id='type-id-2552'/>
+            <parameter type-id='type-id-384' is-artificial='yes'/>
+            <return type-id='type-id-2573'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-370'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-383'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='StringBuilderImpl' filepath='src/mongo/bson/util/builder.h' line='437' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1455' is-artificial='yes'/>
-            <parameter type-id='type-id-370'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1468' is-artificial='yes'/>
+            <parameter type-id='type-id-383'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-372'>
+      <class-decl name='StringData' size-in-bits='128' visibility='default' filepath='src/mongo/base/string_data.h' line='53' column='1' id='type-id-385'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-58' filepath='src/mongo/base/string_data.h' line='157' column='1' id='type-id-3341'/>
+          <typedef-decl name='const_iterator' type-id='type-id-63' filepath='src/mongo/base/string_data.h' line='157' column='1' id='type-id-3366'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_data' type-id='type-id-58' visibility='default' filepath='src/mongo/base/string_data.h' line='167' column='1'/>
+          <var-decl name='_data' type-id='type-id-63' visibility='default' filepath='src/mongo/base/string_data.h' line='167' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_size' type-id='type-id-92' visibility='default' filepath='src/mongo/base/string_data.h' line='168' column='1'/>
+          <var-decl name='_size' type-id='type-id-97' visibility='default' filepath='src/mongo/base/string_data.h' line='168' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2EPKc' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2EPKc'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKSs' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo10StringDataC2ERKSs'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='copyTo' mangled-name='_ZNK5mongo10StringData6copyToEPcb' filepath='src/mongo/base/string_data.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StringData6copyToEPcb'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <parameter type-id='type-id-192'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <parameter type-id='type-id-205'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNK5mongo10StringData4sizeEv' filepath='src/mongo/base/string_data.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo10StringData4sizeEv'>
-            <parameter type-id='type-id-375' is-artificial='yes'/>
-            <return type-id='type-id-92'/>
+            <parameter type-id='type-id-388' is-artificial='yes'/>
+            <return type-id='type-id-97'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-58'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-63'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='StringData' filepath='src/mongo/base/string_data.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1456' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1469' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Timestamp' size-in-bits='64' visibility='default' filepath='src/mongo/bson/timestamp.h' line='40' column='1' id='type-id-376'>
+      <class-decl name='Timestamp' size-in-bits='64' visibility='default' filepath='src/mongo/bson/timestamp.h' line='40' column='1' id='type-id-389'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='i' type-id='type-id-48' visibility='default' filepath='src/mongo/bson/timestamp.h' line='123' column='1'/>
+          <var-decl name='i' type-id='type-id-53' visibility='default' filepath='src/mongo/bson/timestamp.h' line='123' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='32'>
-          <var-decl name='secs' type-id='type-id-48' visibility='default' filepath='src/mongo/bson/timestamp.h' line='124' column='1'/>
+          <var-decl name='secs' type-id='type-id-53' visibility='default' filepath='src/mongo/bson/timestamp.h' line='124' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-102'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-107'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-3342'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-3367'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-102'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-107'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-3342'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-3367'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-314'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-327'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-102'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-107'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-3342'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-3367'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-48'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <parameter type-id='type-id-53'/>
+            <parameter type-id='type-id-53'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='Timestamp' filepath='src/mongo/bson/timestamp.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1457' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1470' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='TrivialAllocator' size-in-bits='8' visibility='default' filepath='src/mongo/bson/util/builder.h' line='77' column='1' id='type-id-1458'>
+      <class-decl name='TrivialAllocator' size-in-bits='8' visibility='default' filepath='src/mongo/bson/util/builder.h' line='77' column='1' id='type-id-1471'>
         <member-function access='public'>
           <function-decl name='Realloc' mangled-name='_ZN5mongo16TrivialAllocator7ReallocEPvm' filepath='src/mongo/bson/util/builder.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator7ReallocEPvm'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-57'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Free' mangled-name='_ZN5mongo16TrivialAllocator4FreeEPv' filepath='src/mongo/bson/util/builder.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator4FreeEPv'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Malloc' mangled-name='_ZN5mongo16TrivialAllocator6MallocEm' filepath='src/mongo/bson/util/builder.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo16TrivialAllocator6MallocEm'>
-            <parameter type-id='type-id-1459' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-52'/>
+            <parameter type-id='type-id-1472' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-57'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_BufBuilder&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='120' column='1' id='type-id-380'>
+      <class-decl name='_BufBuilder&lt;mongo::TrivialAllocator&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/bson/util/builder.h' line='120' column='1' id='type-id-393'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='al' type-id='type-id-1458' visibility='default' filepath='src/mongo/bson/util/builder.h' line='124' column='1'/>
+          <var-decl name='al' type-id='type-id-1471' visibility='default' filepath='src/mongo/bson/util/builder.h' line='124' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='data' type-id='type-id-192' visibility='default' filepath='src/mongo/bson/util/builder.h' line='313' column='1'/>
+          <var-decl name='data' type-id='type-id-205' visibility='default' filepath='src/mongo/bson/util/builder.h' line='313' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='l' type-id='type-id-40' visibility='default' filepath='src/mongo/bson/util/builder.h' line='314' column='1'/>
@@ -22531,87 +22591,87 @@
         </data-member>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-382'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-395'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC2Ei' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEEC2Ei'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED2Ev' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEED2Ev'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='grow' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi' filepath='src/mongo/bson/util/builder.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4growEi'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-192'/>
+            <return type-id='type-id-205'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='grow_reallocate' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi' filepath='src/mongo/bson/util/builder.h' line='297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE15grow_reallocateEi'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='kill' mangled-name='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4killEv' filepath='src/mongo/bson/util/builder.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11_BufBuilderINS_16TrivialAllocatorEE4killEv'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-382'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-395'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <parameter type-id='type-id-382'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <parameter type-id='type-id-395'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_BufBuilder' filepath='src/mongo/bson/util/builder.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1461' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1474' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='BSONType' filepath='src/mongo/bson/bsontypes.h' line='55' column='1' id='type-id-3343'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='BSONType' filepath='src/mongo/bson/bsontypes.h' line='55' column='1' id='type-id-3368'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='MinKey' value='-1'/>
         <enumerator name='EOO' value='0'/>
         <enumerator name='NumberDouble' value='1'/>
@@ -22636,8 +22696,8 @@
         <enumerator name='JSTypeMax' value='18'/>
         <enumerator name='MaxKey' value='127'/>
       </enum-decl>
-      <enum-decl name='BinDataType' filepath='src/mongo/bson/bsontypes.h' line='113' column='1' id='type-id-3344'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='BinDataType' filepath='src/mongo/bson/bsontypes.h' line='113' column='1' id='type-id-3369'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='BinDataGeneral' value='0'/>
         <enumerator name='Function' value='1'/>
         <enumerator name='ByteArrayDeprecated' value='2'/>
@@ -22646,8 +22706,8 @@
         <enumerator name='MD5Type' value='5'/>
         <enumerator name='bdtCustom' value='128'/>
       </enum-decl>
-      <enum-decl name='ExitCode' filepath='src/mongo/util/exit_code.h' line='37' column='1' id='type-id-3345'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='ExitCode' filepath='src/mongo/util/exit_code.h' line='37' column='1' id='type-id-3370'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='EXIT_CLEAN' value='0'/>
         <enumerator name='EXIT_BADOPTIONS' value='2'/>
         <enumerator name='EXIT_REPLICATION_ERROR' value='3'/>
@@ -22667,14 +22727,14 @@
         <enumerator name='EXIT_UNCAUGHT' value='100'/>
         <enumerator name='EXIT_TEST' value='101'/>
       </enum-decl>
-      <enum-decl name='JsonStringFormat' filepath='src/mongo/bson/oid.h' line='225' column='1' id='type-id-3346'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='JsonStringFormat' filepath='src/mongo/bson/oid.h' line='225' column='1' id='type-id-3371'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='Strict' value='0'/>
         <enumerator name='TenGen' value='1'/>
         <enumerator name='JS' value='2'/>
       </enum-decl>
-      <enum-decl name='LockMode' filepath='src/mongo/db/concurrency/lock_manager_defs.h' line='58' column='1' id='type-id-3347'>
-        <underlying-type type-id='type-id-104'/>
+      <enum-decl name='LockMode' filepath='src/mongo/db/concurrency/lock_manager_defs.h' line='58' column='1' id='type-id-3372'>
+        <underlying-type type-id='type-id-109'/>
         <enumerator name='MODE_NONE' value='0'/>
         <enumerator name='MODE_IS' value='1'/>
         <enumerator name='MODE_IX' value='2'/>
@@ -22682,534 +22742,534 @@
         <enumerator name='MODE_X' value='4'/>
         <enumerator name='LockModesCount' value='5'/>
       </enum-decl>
-      <class-decl name='HostAndPort' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/util/net/hostandport.h' line='49' column='1' id='type-id-323'>
+      <class-decl name='HostAndPort' size-in-bits='128' is-struct='yes' visibility='default' filepath='src/mongo/util/net/hostandport.h' line='49' column='1' id='type-id-336'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_host' type-id='type-id-2552' visibility='default' filepath='src/mongo/util/net/hostandport.h' line='121' column='1'/>
+          <var-decl name='_host' type-id='type-id-2573' visibility='default' filepath='src/mongo/util/net/hostandport.h' line='121' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_port' type-id='type-id-40' visibility='default' filepath='src/mongo/util/net/hostandport.h' line='122' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-385'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='HostAndPort' filepath='src/mongo/util/net/hostandport.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-1426' is-artificial='yes'/>
-            <parameter type-id='type-id-2554'/>
+            <parameter type-id='type-id-1438' is-artificial='yes'/>
+            <parameter type-id='type-id-2575'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='AtomicUInt32' type-id='type-id-290' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-3340'/>
-      <typedef-decl name='BufBuilder' type-id='type-id-380' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1416'/>
-      <typedef-decl name='Milliseconds' type-id='type-id-3315' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-327'/>
-      <typedef-decl name='Seconds' type-id='type-id-3316' filepath='src/mongo/util/time_support.h' line='48' column='1' id='type-id-3342'/>
-      <typedef-decl name='StringBuilder' type-id='type-id-368' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1452'/>
-      <class-decl name='OperationContext' visibility='default' is-declaration-only='yes' id='type-id-2588'/>
-      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3348'/>
-      <class-decl name='ThreadPool' visibility='default' is-declaration-only='yes' id='type-id-3339'/>
-      <typedef-decl name='BSONElementSet' type-id='type-id-3296' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-2586'/>
-      <typedef-decl name='BSONElementMSet' type-id='type-id-3295' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-2584'/>
+      <typedef-decl name='AtomicUInt32' type-id='type-id-303' filepath='src/mongo/platform/atomic_word.h' line='159' column='1' id='type-id-3365'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-393' filepath='src/mongo/bson/util/builder.h' line='321' column='1' id='type-id-1428'/>
+      <typedef-decl name='Milliseconds' type-id='type-id-3340' filepath='src/mongo/util/time_support.h' line='47' column='1' id='type-id-340'/>
+      <typedef-decl name='Seconds' type-id='type-id-3341' filepath='src/mongo/util/time_support.h' line='48' column='1' id='type-id-3367'/>
+      <typedef-decl name='StringBuilder' type-id='type-id-381' filepath='src/mongo/bson/util/builder.h' line='451' column='1' id='type-id-1465'/>
+      <class-decl name='OperationContext' visibility='default' is-declaration-only='yes' id='type-id-2609'/>
+      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3373'/>
+      <class-decl name='ThreadPool' visibility='default' is-declaration-only='yes' id='type-id-3364'/>
+      <typedef-decl name='BSONElementSet' type-id='type-id-3321' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-2607'/>
+      <typedef-decl name='BSONElementMSet' type-id='type-id-3320' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-2605'/>
       <namespace-decl name='repl'>
-        <class-decl name='ReplicationExecutor' size-in-bits='7488' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='92' column='1' id='type-id-437'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2601'/>
+        <class-decl name='ReplicationExecutor' size-in-bits='7488' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='92' column='1' id='type-id-118'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2622'/>
           <member-type access='private'>
-            <class-decl name='Callback' size-in-bits='640' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='327' column='1' id='type-id-1503'>
-              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2603'/>
+            <class-decl name='Callback' size-in-bits='640' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='327' column='1' id='type-id-1516'>
+              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2624'/>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='_executor' type-id='type-id-1498' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='341' column='1'/>
+                <var-decl name='_executor' type-id='type-id-1511' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='341' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
-                <var-decl name='_callbackFn' type-id='type-id-395' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='344' column='1'/>
+                <var-decl name='_callbackFn' type-id='type-id-408' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='344' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='384'>
                 <var-decl name='_isCanceled' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='345' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='448'>
-                <var-decl name='_iter' type-id='type-id-642' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='346' column='1'/>
+                <var-decl name='_iter' type-id='type-id-654' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='346' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='512'>
-                <var-decl name='_finishedEvent' type-id='type-id-402' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='347' column='1'/>
+                <var-decl name='_finishedEvent' type-id='type-id-415' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='347' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='Callback' mangled-name='_ZN5mongo4repl19ReplicationExecutor8CallbackC2EPS1_St8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKSt14_List_iteratorINS1_8WorkItemEERKNS6_11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8CallbackC2EPS1_St8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKSt14_List_iteratorINS1_8WorkItemEERKNS6_11EventHandleE'>
-                  <parameter type-id='type-id-1504' is-artificial='yes'/>
-                  <parameter type-id='type-id-1498'/>
-                  <parameter type-id='type-id-396'/>
-                  <parameter type-id='type-id-644'/>
-                  <parameter type-id='type-id-404'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1517' is-artificial='yes'/>
+                  <parameter type-id='type-id-1511'/>
+                  <parameter type-id='type-id-409'/>
+                  <parameter type-id='type-id-656'/>
+                  <parameter type-id='type-id-417'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' destructor='yes' vtable-offset='0'>
                 <function-decl name='~Callback' mangled-name='_ZN5mongo4repl19ReplicationExecutor8CallbackD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8CallbackD2Ev'>
-                  <parameter type-id='type-id-1504' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1517' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='2'>
                 <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ReplicationExecutor8Callback6cancelEv' filepath='src/mongo/db/repl/replication_executor.h' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8Callback6cancelEv'>
-                  <parameter type-id='type-id-1504' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1517' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='3'>
                 <function-decl name='waitForCompletion' mangled-name='_ZN5mongo4repl19ReplicationExecutor8Callback17waitForCompletionEv' filepath='src/mongo/db/repl/replication_executor.h' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8Callback17waitForCompletionEv'>
-                  <parameter type-id='type-id-1504' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1517' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='Event' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='379' column='1' id='type-id-441'>
-              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2607'/>
+            <class-decl name='Event' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='379' column='1' id='type-id-453'>
+              <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2628'/>
               <data-member access='private' layout-offset-in-bits='64'>
-                <var-decl name='_executor' type-id='type-id-1498' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='395' column='1'/>
+                <var-decl name='_executor' type-id='type-id-1511' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='395' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='128'>
                 <var-decl name='_isSignaled' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='398' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='192'>
-                <var-decl name='_isSignaledCondition' type-id='type-id-3349' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='399' column='1'/>
+                <var-decl name='_isSignaledCondition' type-id='type-id-3374' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='399' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='576'>
-                <var-decl name='_iter' type-id='type-id-632' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='400' column='1'/>
+                <var-decl name='_iter' type-id='type-id-644' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='400' column='1'/>
               </data-member>
               <data-member access='private' layout-offset-in-bits='640'>
-                <var-decl name='_waiters' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='401' column='1'/>
+                <var-decl name='_waiters' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='401' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='Event' mangled-name='_ZN5mongo4repl19ReplicationExecutor5EventC2EPS1_RKSt14_List_iteratorINS_8executor12TaskExecutor11EventHandleEE' filepath='src/mongo/db/repl/replication_executor.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5EventC2EPS1_RKSt14_List_iteratorINS_8executor12TaskExecutor11EventHandleEE'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <parameter type-id='type-id-1498'/>
-                  <parameter type-id='type-id-634'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
+                  <parameter type-id='type-id-1511'/>
+                  <parameter type-id='type-id-646'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='private'>
                 <function-decl name='_signal_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event14_signal_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event14_signal_inlockEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' destructor='yes' vtable-offset='0'>
                 <function-decl name='~Event' mangled-name='_ZN5mongo4repl19ReplicationExecutor5EventD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5EventD2Ev'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='2'>
                 <function-decl name='signal' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event6signalEv' filepath='src/mongo/db/repl/replication_executor.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event6signalEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='3'>
                 <function-decl name='waitUntilSignaled' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event17waitUntilSignaledEv' filepath='src/mongo/db/repl/replication_executor.h' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event17waitUntilSignaledEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' vtable-offset='4'>
                 <function-decl name='isSignaled' mangled-name='_ZN5mongo4repl19ReplicationExecutor5Event10isSignaledEv' filepath='src/mongo/db/repl/replication_executor.h' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor5Event10isSignaledEv'>
-                  <parameter type-id='type-id-1506' is-artificial='yes'/>
+                  <parameter type-id='type-id-1519' is-artificial='yes'/>
                   <return type-id='type-id-1'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='WorkItem' size-in-bits='448' is-struct='yes' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='364' column='1' id='type-id-445'>
+            <class-decl name='WorkItem' size-in-bits='448' is-struct='yes' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='364' column='1' id='type-id-457'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='generation' type-id='type-id-96' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='366' column='1'/>
+                <var-decl name='generation' type-id='type-id-101' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='366' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='callback' type-id='type-id-398' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='367' column='1'/>
+                <var-decl name='callback' type-id='type-id-411' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='367' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='192'>
-                <var-decl name='finishedEvent' type-id='type-id-402' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='368' column='1'/>
+                <var-decl name='finishedEvent' type-id='type-id-415' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='368' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='320'>
-                <var-decl name='readyDate' type-id='type-id-314' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='369' column='1'/>
+                <var-decl name='readyDate' type-id='type-id-327' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='369' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='384'>
                 <var-decl name='isNetworkOperation' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='370' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='WorkItem' mangled-name='_ZN5mongo4repl19ReplicationExecutor8WorkItemC2Ev' filepath='src/mongo/db/repl/replication_executor.h' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8WorkItemC2Ev'>
-                  <parameter type-id='type-id-1509' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1522' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='EventList' type-id='type-id-1159' filepath='src/mongo/db/repl/replication_executor.h' line='217' column='1' id='type-id-3350'/>
+            <typedef-decl name='EventList' type-id='type-id-1171' filepath='src/mongo/db/repl/replication_executor.h' line='217' column='1' id='type-id-3375'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='WorkQueue' type-id='type-id-1169' filepath='src/mongo/db/repl/replication_executor.h' line='212' column='1' id='type-id-1510'/>
+            <typedef-decl name='WorkQueue' type-id='type-id-1181' filepath='src/mongo/db/repl/replication_executor.h' line='212' column='1' id='type-id-1523'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_random' type-id='type-id-1435' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='301' column='1'/>
+            <var-decl name='_random' type-id='type-id-1448' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='301' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='_networkInterface' type-id='type-id-1277' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='303' column='1'/>
+            <var-decl name='_networkInterface' type-id='type-id-1289' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='303' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='_storageInterface' type-id='type-id-1284' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='304' column='1'/>
+            <var-decl name='_storageInterface' type-id='type-id-1296' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='304' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='_executorThread' type-id='type-id-3351' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='307' column='1'/>
+            <var-decl name='_executorThread' type-id='type-id-3376' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='307' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='384'>
-            <var-decl name='_mutex' type-id='type-id-1182' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='309' column='1'/>
+            <var-decl name='_mutex' type-id='type-id-1194' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='309' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='704'>
-            <var-decl name='_terribleExLockSyncMutex' type-id='type-id-1182' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='310' column='1'/>
+            <var-decl name='_terribleExLockSyncMutex' type-id='type-id-1194' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='310' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1024'>
-            <var-decl name='_noMoreWaitingThreads' type-id='type-id-3349' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='311' column='1'/>
+            <var-decl name='_noMoreWaitingThreads' type-id='type-id-3374' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='311' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1408'>
-            <var-decl name='_freeQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='312' column='1'/>
+            <var-decl name='_freeQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='312' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1536'>
-            <var-decl name='_readyQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='313' column='1'/>
+            <var-decl name='_readyQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='313' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1664'>
-            <var-decl name='_dbWorkInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='314' column='1'/>
+            <var-decl name='_dbWorkInProgressQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='314' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1792'>
-            <var-decl name='_exclusiveLockInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='315' column='1'/>
+            <var-decl name='_exclusiveLockInProgressQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='315' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='1920'>
-            <var-decl name='_networkInProgressQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='316' column='1'/>
+            <var-decl name='_networkInProgressQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='316' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2048'>
-            <var-decl name='_sleepersQueue' type-id='type-id-1510' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='317' column='1'/>
+            <var-decl name='_sleepersQueue' type-id='type-id-1523' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='317' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2176'>
-            <var-decl name='_unsignaledEvents' type-id='type-id-3350' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='318' column='1'/>
+            <var-decl name='_unsignaledEvents' type-id='type-id-3375' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='318' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2304'>
-            <var-decl name='_totalEventWaiters' type-id='type-id-82' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='319' column='1'/>
+            <var-decl name='_totalEventWaiters' type-id='type-id-87' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='319' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2368'>
             <var-decl name='_inShutdown' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='320' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='2432'>
-            <var-decl name='_dblockWorkers' type-id='type-id-337' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='321' column='1'/>
+            <var-decl name='_dblockWorkers' type-id='type-id-350' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='321' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='4864'>
-            <var-decl name='_dblockTaskRunner' type-id='type-id-3352' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='322' column='1'/>
+            <var-decl name='_dblockTaskRunner' type-id='type-id-3377' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='322' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='6144'>
-            <var-decl name='_dblockExclusiveLockTaskRunner' type-id='type-id-3352' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='323' column='1'/>
+            <var-decl name='_dblockExclusiveLockTaskRunner' type-id='type-id-3377' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='323' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='7424'>
-            <var-decl name='_nextId' type-id='type-id-96' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='324' column='1'/>
+            <var-decl name='_nextId' type-id='type-id-101' visibility='default' filepath='src/mongo/db/repl/replication_executor.h' line='324' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ReplicationExecutor' filepath='src/mongo/db/repl/replication_executor.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-439'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-451'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ReplicationExecutor' mangled-name='_ZN5mongo4repl19ReplicationExecutorC2EPNS_8executor16NetworkInterfaceEPNS0_16StorageInterfaceEl' filepath='src/mongo/db/repl/replication_executor.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutorC2EPNS_8executor16NetworkInterfaceEPNS0_16StorageInterfaceEl'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-2597'/>
-              <parameter type-id='type-id-2622'/>
-              <parameter type-id='type-id-82'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-2618'/>
+              <parameter type-id='type-id-2642'/>
+              <parameter type-id='type-id-87'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleWorkWithGlobalExclusiveLock' mangled-name='_ZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor35scheduleWorkWithGlobalExclusiveLockERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleDBWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKNS_15NamespaceStringENS_8LockModeE' filepath='src/mongo/db/repl/replication_executor.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEERKNS_15NamespaceStringENS_8LockModeE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
-              <parameter type-id='type-id-331'/>
-              <parameter type-id='type-id-3347'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-410'/>
+              <parameter type-id='type-id-344'/>
+              <parameter type-id='type-id-3372'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_getDiagnosticString_inlock' mangled-name='_ZNK5mongo4repl19ReplicationExecutor27_getDiagnosticString_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo4repl19ReplicationExecutor27_getDiagnosticString_inlockEv'>
-              <parameter type-id='type-id-440' is-artificial='yes'/>
-              <return type-id='type-id-2552'/>
+              <parameter type-id='type-id-452' is-artificial='yes'/>
+              <return type-id='type-id-2573'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ReplicationExecutor3runEv' filepath='src/mongo/db/repl/replication_executor.h' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor3runEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='getWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor7getWorkEv' filepath='src/mongo/db/repl/replication_executor.h' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7getWorkEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-1192'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-1204'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_getCallbackFromHandle' mangled-name='_ZN5mongo4repl19ReplicationExecutor22_getCallbackFromHandleERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor22_getCallbackFromHandleERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-400'/>
-              <return type-id='type-id-1504'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-413'/>
+              <return type-id='type-id-1517'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='finishShutdown' mangled-name='_ZN5mongo4repl19ReplicationExecutor14finishShutdownEv' filepath='src/mongo/db/repl/replication_executor.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14finishShutdownEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_getEventFromHandle' mangled-name='_ZN5mongo4repl19ReplicationExecutor19_getEventFromHandleERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor19_getEventFromHandleERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-404'/>
-              <return type-id='type-id-1506'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-417'/>
+              <return type-id='type-id-1519'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='signalEvent_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor18signalEvent_inlockERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor18signalEvent_inlockERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-404'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-417'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='maybeNotifyShutdownComplete_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor34maybeNotifyShutdownComplete_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor34maybeNotifyShutdownComplete_inlockEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='makeEvent_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor16makeEvent_inlockEv' filepath='src/mongo/db/repl/replication_executor.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor16makeEvent_inlockEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-365'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-378'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='enqueueWork_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor18enqueueWork_inlockEPSt4listINS1_8WorkItemESaIS3_EERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor18enqueueWork_inlockEPSt4listINS1_8WorkItemESaIS3_EERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-1511'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-1524'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_finishRemoteCommand' mangled-name='_ZN5mongo4repl19ReplicationExecutor20_finishRemoteCommandERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEERKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSB_25RemoteCommandCallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor20_finishRemoteCommandERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEERKNS2_12TaskExecutor14CallbackHandleEmRKSt8functionIFvRKNSB_25RemoteCommandCallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-386'/>
-              <parameter type-id='type-id-360'/>
-              <parameter type-id='type-id-400'/>
-              <parameter type-id='type-id-1330'/>
-              <parameter type-id='type-id-411'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-399'/>
+              <parameter type-id='type-id-373'/>
+              <parameter type-id='type-id-413'/>
+              <parameter type-id='type-id-1342'/>
+              <parameter type-id='type-id-424'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='scheduleDBWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleDBWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_doOperation' mangled-name='_ZN5mongo4repl19ReplicationExecutor12_doOperationEPNS_16OperationContextERKNS_6StatusERKNS_8executor12TaskExecutor14CallbackHandleEPSt4listINS1_8WorkItemESaISD_EEPSt5mutex' filepath='src/mongo/db/repl/replication_executor.h' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12_doOperationEPNS_16OperationContextERKNS_6StatusERKNS_8executor12TaskExecutor14CallbackHandleEPSt4listINS1_8WorkItemESaISD_EEPSt5mutex'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-2590'/>
-              <parameter type-id='type-id-356'/>
-              <parameter type-id='type-id-400'/>
-              <parameter type-id='type-id-1511'/>
-              <parameter type-id='type-id-2101'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-2611'/>
+              <parameter type-id='type-id-369'/>
+              <parameter type-id='type-id-413'/>
+              <parameter type-id='type-id-1524'/>
+              <parameter type-id='type-id-2114'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='scheduleReadySleepers_inlock' mangled-name='_ZN5mongo4repl19ReplicationExecutor28scheduleReadySleepers_inlockENS_6Date_tE' filepath='src/mongo/db/repl/replication_executor.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor28scheduleReadySleepers_inlockENS_6Date_tE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-314'/>
-              <return type-id='type-id-314'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-327'/>
+              <return type-id='type-id-327'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='nextRandomInt64' mangled-name='_ZN5mongo4repl19ReplicationExecutor15nextRandomInt64El' filepath='src/mongo/db/repl/replication_executor.h' line='196' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor15nextRandomInt64El'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-82'/>
-              <return type-id='type-id-82'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-87'/>
+              <return type-id='type-id-87'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~ReplicationExecutor' mangled-name='_ZN5mongo4repl19ReplicationExecutorD0Ev' filepath='src/mongo/db/repl/replication_executor.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutorD2Ev'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='startup' mangled-name='_ZN5mongo4repl19ReplicationExecutor7startupEv' filepath='src/mongo/db/repl/replication_executor.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7startupEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='3'>
             <function-decl name='shutdown' mangled-name='_ZN5mongo4repl19ReplicationExecutor8shutdownEv' filepath='src/mongo/db/repl/replication_executor.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor8shutdownEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='join' mangled-name='_ZN5mongo4repl19ReplicationExecutor4joinEv' filepath='src/mongo/db/repl/replication_executor.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor4joinEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='getDiagnosticString' mangled-name='_ZN5mongo4repl19ReplicationExecutor19getDiagnosticStringEv' filepath='src/mongo/db/repl/replication_executor.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor19getDiagnosticStringEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-2552'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-2573'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='6'>
             <function-decl name='now' mangled-name='_ZN5mongo4repl19ReplicationExecutor3nowEv' filepath='src/mongo/db/repl/replication_executor.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor3nowEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-314'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-327'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='7'>
             <function-decl name='makeEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor9makeEventEv' filepath='src/mongo/db/repl/replication_executor.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor9makeEventEv'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <return type-id='type-id-365'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <return type-id='type-id-378'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='8'>
             <function-decl name='signalEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor11signalEventERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor11signalEventERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-404'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-417'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='9'>
             <function-decl name='onEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor7onEventERKNS_8executor12TaskExecutor11EventHandleERKSt8functionIFvRKNS3_12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor7onEventERKNS_8executor12TaskExecutor11EventHandleERKSt8functionIFvRKNS3_12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-404'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-417'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='10'>
             <function-decl name='waitForEvent' mangled-name='_ZN5mongo4repl19ReplicationExecutor12waitForEventERKNS_8executor12TaskExecutor11EventHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12waitForEventERKNS_8executor12TaskExecutor11EventHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-404'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-417'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='11'>
             <function-decl name='scheduleWork' mangled-name='_ZN5mongo4repl19ReplicationExecutor12scheduleWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor12scheduleWorkERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='12'>
             <function-decl name='scheduleWorkAt' mangled-name='_ZN5mongo4repl19ReplicationExecutor14scheduleWorkAtENS_6Date_tERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor14scheduleWorkAtENS_6Date_tERKSt8functionIFvRKNS_8executor12TaskExecutor12CallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-314'/>
-              <parameter type-id='type-id-397'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-327'/>
+              <parameter type-id='type-id-410'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='13'>
             <function-decl name='scheduleRemoteCommand' mangled-name='_ZN5mongo4repl19ReplicationExecutor21scheduleRemoteCommandERKNS_8executor20RemoteCommandRequestERKSt8functionIFvRKNS2_12TaskExecutor25RemoteCommandCallbackArgsEEE' filepath='src/mongo/db/repl/replication_executor.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor21scheduleRemoteCommandERKNS_8executor20RemoteCommandRequestERKSt8functionIFvRKNS2_12TaskExecutor25RemoteCommandCallbackArgsEEE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-386'/>
-              <parameter type-id='type-id-411'/>
-              <return type-id='type-id-362'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-399'/>
+              <parameter type-id='type-id-424'/>
+              <return type-id='type-id-375'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='14'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ReplicationExecutor6cancelERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor6cancelERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-400'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-413'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='15'>
             <function-decl name='wait' mangled-name='_ZN5mongo4repl19ReplicationExecutor4waitERKNS_8executor12TaskExecutor14CallbackHandleE' filepath='src/mongo/db/repl/replication_executor.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ReplicationExecutor4waitERKNS_8executor12TaskExecutor14CallbackHandleE'>
-              <parameter type-id='type-id-1498' is-artificial='yes'/>
-              <parameter type-id='type-id-400'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1511' is-artificial='yes'/>
+              <parameter type-id='type-id-413'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='StorageInterface' visibility='default' is-declaration-only='yes' id='type-id-2620'/>
-        <class-decl name='TaskRunner' visibility='default' is-declaration-only='yes' id='type-id-3352'>
+        <class-decl name='StorageInterface' visibility='default' is-declaration-only='yes' id='type-id-47'/>
+        <class-decl name='TaskRunner' visibility='default' is-declaration-only='yes' id='type-id-3377'>
           <member-type access='private'>
-            <enum-decl name='NextAction' filepath='src/mongo/db/repl/task_runner.h' line='53' column='1' id='type-id-2770'>
-              <underlying-type type-id='type-id-104'/>
+            <enum-decl name='NextAction' filepath='src/mongo/db/repl/task_runner.h' line='53' column='1' id='type-id-2792'>
+              <underlying-type type-id='type-id-109'/>
               <enumerator name='kInvalid' value='0'/>
               <enumerator name='kDisposeOperationContext' value='1'/>
               <enumerator name='kKeepOperationContext' value='2'/>
@@ -23219,396 +23279,396 @@
         </class-decl>
       </namespace-decl>
       <namespace-decl name='executor'>
-        <class-decl name='RemoteCommandRequest' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='44' column='1' id='type-id-384'>
+        <class-decl name='RemoteCommandRequest' size-in-bits='576' is-struct='yes' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='44' column='1' id='type-id-397'>
           <data-member access='public' static='yes'>
-            <var-decl name='kNoTimeout' type-id='type-id-328' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='46' column='1'/>
+            <var-decl name='kNoTimeout' type-id='type-id-341' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='46' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='kNoExpirationDate' type-id='type-id-315' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='49' column='1'/>
+            <var-decl name='kNoExpirationDate' type-id='type-id-328' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='49' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='target' type-id='type-id-323' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='77' column='1'/>
+            <var-decl name='target' type-id='type-id-336' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='77' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='dbname' type-id='type-id-2552' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='78' column='1'/>
+            <var-decl name='dbname' type-id='type-id-2573' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='78' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='metadata' type-id='type-id-297' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='79' column='1'/>
+            <var-decl name='metadata' type-id='type-id-310' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='79' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='cmdObj' type-id='type-id-297' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='80' column='1'/>
+            <var-decl name='cmdObj' type-id='type-id-310' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='80' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
-            <var-decl name='timeout' type-id='type-id-327' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='81' column='1'/>
+            <var-decl name='timeout' type-id='type-id-340' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='81' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='512'>
-            <var-decl name='expirationDate' type-id='type-id-314' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='84' column='1'/>
+            <var-decl name='expirationDate' type-id='type-id-327' visibility='default' filepath='src/mongo/executor/remote_command_request.h' line='84' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandRequest' filepath='src/mongo/executor/remote_command_request.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1464' is-artificial='yes'/>
-              <parameter type-id='type-id-325'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-299'/>
-              <parameter type-id='type-id-328'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1477' is-artificial='yes'/>
+              <parameter type-id='type-id-338'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-312'/>
+              <parameter type-id='type-id-341'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='RemoteCommandResponse' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='43' column='1' id='type-id-388'>
+        <class-decl name='RemoteCommandResponse' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='43' column='1' id='type-id-401'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='data' type-id='type-id-297' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='51' column='1'/>
+            <var-decl name='data' type-id='type-id-310' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='51' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='metadata' type-id='type-id-297' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='52' column='1'/>
+            <var-decl name='metadata' type-id='type-id-310' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='52' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='elapsedMillis' type-id='type-id-327' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='53' column='1'/>
+            <var-decl name='elapsedMillis' type-id='type-id-340' visibility='default' filepath='src/mongo/executor/remote_command_response.h' line='53' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-327'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-340'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-327'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-340'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='RemoteCommandResponse' filepath='src/mongo/executor/remote_command_response.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1467' is-artificial='yes'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-297'/>
-              <parameter type-id='type-id-327'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-310'/>
+              <parameter type-id='type-id-340'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='NetworkInterface' visibility='default' is-declaration-only='yes' id='type-id-2595'/>
-        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-2601'>
+        <class-decl name='NetworkInterface' visibility='default' is-declaration-only='yes' id='type-id-2616'/>
+        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-2622'>
           <member-type access='private'>
-            <class-decl name='CallbackHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='267' column='1' id='type-id-398'>
+            <class-decl name='CallbackHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='267' column='1' id='type-id-411'>
               <data-member access='private' layout-offset-in-bits='0'>
-                <var-decl name='_callback' type-id='type-id-1195' visibility='default' filepath='src/mongo/executor/task_executor.h' line='295' column='1'/>
+                <var-decl name='_callback' type-id='type-id-1207' visibility='default' filepath='src/mongo/executor/task_executor.h' line='295' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1473' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1486' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='private' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1473' is-artificial='yes'/>
-                  <parameter type-id='type-id-1195'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1486' is-artificial='yes'/>
+                  <parameter type-id='type-id-1207'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public'>
                 <function-decl name='isValid' mangled-name='_ZNK5mongo8executor12TaskExecutor14CallbackHandle7isValidEv' filepath='src/mongo/executor/task_executor.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo8executor12TaskExecutor14CallbackHandle7isValidEv'>
-                  <parameter type-id='type-id-401' is-artificial='yes'/>
+                  <parameter type-id='type-id-414' is-artificial='yes'/>
                   <return type-id='type-id-1'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1473' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1486' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='private' constructor='yes'>
                 <function-decl name='CallbackHandle' filepath='src/mongo/executor/task_executor.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1473' is-artificial='yes'/>
-                  <parameter type-id='type-id-1195'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1486' is-artificial='yes'/>
+                  <parameter type-id='type-id-1207'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='EventHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='318' column='1' id='type-id-402'>
+            <class-decl name='EventHandle' size-in-bits='128' visibility='default' filepath='src/mongo/executor/task_executor.h' line='318' column='1' id='type-id-415'>
               <data-member access='private' layout-offset-in-bits='0'>
-                <var-decl name='_event' type-id='type-id-1198' visibility='default' filepath='src/mongo/executor/task_executor.h' line='346' column='1'/>
+                <var-decl name='_event' type-id='type-id-1210' visibility='default' filepath='src/mongo/executor/task_executor.h' line='346' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1476' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1489' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1476' is-artificial='yes'/>
-                  <parameter type-id='type-id-1198'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1489' is-artificial='yes'/>
+                  <parameter type-id='type-id-1210'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1476' is-artificial='yes'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1489' is-artificial='yes'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='EventHandle' filepath='src/mongo/executor/task_executor.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1476' is-artificial='yes'/>
-                  <parameter type-id='type-id-1198'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1489' is-artificial='yes'/>
+                  <parameter type-id='type-id-1210'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public'>
                 <function-decl name='isValid' mangled-name='_ZNK5mongo8executor12TaskExecutor11EventHandle7isValidEv' filepath='src/mongo/executor/task_executor.h' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo8executor12TaskExecutor11EventHandle7isValidEv'>
-                  <parameter type-id='type-id-405' is-artificial='yes'/>
+                  <parameter type-id='type-id-418' is-artificial='yes'/>
                   <return type-id='type-id-1'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='CallbackArgs' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='352' column='1' id='type-id-392'>
+            <class-decl name='CallbackArgs' size-in-bits='320' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='352' column='1' id='type-id-405'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='executor' type-id='type-id-2602' visibility='default' filepath='src/mongo/executor/task_executor.h' line='358' column='1'/>
+                <var-decl name='executor' type-id='type-id-2623' visibility='default' filepath='src/mongo/executor/task_executor.h' line='358' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='myHandle' type-id='type-id-398' visibility='default' filepath='src/mongo/executor/task_executor.h' line='359' column='1'/>
+                <var-decl name='myHandle' type-id='type-id-411' visibility='default' filepath='src/mongo/executor/task_executor.h' line='359' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='192'>
-                <var-decl name='status' type-id='type-id-354' visibility='default' filepath='src/mongo/executor/task_executor.h' line='360' column='1'/>
+                <var-decl name='status' type-id='type-id-367' visibility='default' filepath='src/mongo/executor/task_executor.h' line='360' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='256'>
-                <var-decl name='txn' type-id='type-id-2589' visibility='default' filepath='src/mongo/executor/task_executor.h' line='361' column='1'/>
+                <var-decl name='txn' type-id='type-id-2610' visibility='default' filepath='src/mongo/executor/task_executor.h' line='361' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackArgs' filepath='src/mongo/executor/task_executor.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1470' is-artificial='yes'/>
-                  <parameter type-id='type-id-2602'/>
-                  <parameter type-id='type-id-398'/>
-                  <parameter type-id='type-id-354'/>
-                  <parameter type-id='type-id-2589'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1483' is-artificial='yes'/>
+                  <parameter type-id='type-id-2623'/>
+                  <parameter type-id='type-id-411'/>
+                  <parameter type-id='type-id-367'/>
+                  <parameter type-id='type-id-2610'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='CallbackArgs' filepath='src/mongo/executor/task_executor.h' line='353' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1470' is-artificial='yes'/>
-                  <parameter type-id='type-id-3353'/>
-                  <parameter type-id='type-id-398'/>
-                  <parameter type-id='type-id-354'/>
-                  <parameter type-id='type-id-3354'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1483' is-artificial='yes'/>
+                  <parameter type-id='type-id-3378'/>
+                  <parameter type-id='type-id-411'/>
+                  <parameter type-id='type-id-367'/>
+                  <parameter type-id='type-id-3379'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <class-decl name='RemoteCommandCallbackArgs' size-in-bits='1216' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='367' column='1' id='type-id-406'>
+            <class-decl name='RemoteCommandCallbackArgs' size-in-bits='1216' is-struct='yes' visibility='default' filepath='src/mongo/executor/task_executor.h' line='367' column='1' id='type-id-419'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='executor' type-id='type-id-2602' visibility='default' filepath='src/mongo/executor/task_executor.h' line='373' column='1'/>
+                <var-decl name='executor' type-id='type-id-2623' visibility='default' filepath='src/mongo/executor/task_executor.h' line='373' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='myHandle' type-id='type-id-398' visibility='default' filepath='src/mongo/executor/task_executor.h' line='374' column='1'/>
+                <var-decl name='myHandle' type-id='type-id-411' visibility='default' filepath='src/mongo/executor/task_executor.h' line='374' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='192'>
-                <var-decl name='request' type-id='type-id-384' visibility='default' filepath='src/mongo/executor/task_executor.h' line='375' column='1'/>
+                <var-decl name='request' type-id='type-id-397' visibility='default' filepath='src/mongo/executor/task_executor.h' line='375' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='768'>
-                <var-decl name='response' type-id='type-id-358' visibility='default' filepath='src/mongo/executor/task_executor.h' line='376' column='1'/>
+                <var-decl name='response' type-id='type-id-371' visibility='default' filepath='src/mongo/executor/task_executor.h' line='376' column='1'/>
               </data-member>
               <member-function access='public' constructor='yes'>
                 <function-decl name='RemoteCommandCallbackArgs' filepath='src/mongo/executor/task_executor.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1477' is-artificial='yes'/>
-                  <parameter type-id='type-id-2602'/>
-                  <parameter type-id='type-id-400'/>
-                  <parameter type-id='type-id-386'/>
-                  <parameter type-id='type-id-360'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1490' is-artificial='yes'/>
+                  <parameter type-id='type-id-2623'/>
+                  <parameter type-id='type-id-413'/>
+                  <parameter type-id='type-id-399'/>
+                  <parameter type-id='type-id-373'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
               <member-function access='public' constructor='yes'>
                 <function-decl name='RemoteCommandCallbackArgs' filepath='src/mongo/executor/task_executor.h' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-                  <parameter type-id='type-id-1477' is-artificial='yes'/>
-                  <parameter type-id='type-id-3353'/>
-                  <parameter type-id='type-id-400'/>
-                  <parameter type-id='type-id-386'/>
-                  <parameter type-id='type-id-360'/>
-                  <return type-id='type-id-2675'/>
+                  <parameter type-id='type-id-1490' is-artificial='yes'/>
+                  <parameter type-id='type-id-3378'/>
+                  <parameter type-id='type-id-413'/>
+                  <parameter type-id='type-id-399'/>
+                  <parameter type-id='type-id-373'/>
+                  <return type-id='type-id-2697'/>
                 </function-decl>
               </member-function>
             </class-decl>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='CallbackFn' type-id='type-id-1141' filepath='src/mongo/executor/task_executor.h' line='90' column='1' id='type-id-395'/>
+            <typedef-decl name='CallbackFn' type-id='type-id-1153' filepath='src/mongo/executor/task_executor.h' line='90' column='1' id='type-id-408'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='RemoteCommandCallbackFn' type-id='type-id-1145' filepath='src/mongo/executor/task_executor.h' line='101' column='1' id='type-id-409'/>
+            <typedef-decl name='RemoteCommandCallbackFn' type-id='type-id-1157' filepath='src/mongo/executor/task_executor.h' line='101' column='1' id='type-id-422'/>
           </member-type>
           <member-type access='private'>
-            <class-decl name='CallbackState' visibility='default' is-declaration-only='yes' id='type-id-2603'/>
+            <class-decl name='CallbackState' visibility='default' is-declaration-only='yes' id='type-id-2624'/>
           </member-type>
           <member-type access='private'>
-            <class-decl name='EventState' visibility='default' is-declaration-only='yes' id='type-id-2607'/>
+            <class-decl name='EventState' visibility='default' is-declaration-only='yes' id='type-id-2628'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='logger'>
-        <class-decl name='ComponentMessageLogDomain' size-in-bits='448' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='39' column='1' id='type-id-412'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-427'/>
+        <class-decl name='ComponentMessageLogDomain' size-in-bits='448' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='39' column='1' id='type-id-425'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-440'/>
           <data-member access='private' layout-offset-in-bits='200'>
-            <var-decl name='_settings' type-id='type-id-423' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='83' column='1'/>
+            <var-decl name='_settings' type-id='type-id-436' visibility='default' filepath='src/mongo/logger/component_message_log_domain.h' line='83' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1479' is-artificial='yes'/>
-              <parameter type-id='type-id-414'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1492' is-artificial='yes'/>
+              <parameter type-id='type-id-427'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1479' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1492' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~ComponentMessageLogDomain' filepath='src/mongo/logger/component_message_log_domain.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1479' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1492' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LabeledLevel' size-in-bits='128' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='40' column='1' id='type-id-416'>
+        <class-decl name='LabeledLevel' size-in-bits='128' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='40' column='1' id='type-id-429'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_label' type-id='type-id-2552' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='66' column='1'/>
+            <var-decl name='_label' type-id='type-id-2573' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='66' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
             <var-decl name='_level' type-id='type-id-40' visibility='default' filepath='src/mongo/logger/labeled_level.h' line='67' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1480' is-artificial='yes'/>
+              <parameter type-id='type-id-1493' is-artificial='yes'/>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-2675'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1480' is-artificial='yes'/>
-              <parameter type-id='type-id-58'/>
+              <parameter type-id='type-id-1493' is-artificial='yes'/>
+              <parameter type-id='type-id-63'/>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-2675'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LabeledLevel' filepath='src/mongo/logger/labeled_level.h' line='44' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1480' is-artificial='yes'/>
-              <parameter type-id='type-id-2554'/>
+              <parameter type-id='type-id-1493' is-artificial='yes'/>
+              <parameter type-id='type-id-2575'/>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-2675'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-420'>
+        <class-decl name='LogComponent' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_component.h' line='43' column='1' id='type-id-433'>
           <member-type access='private'>
-            <enum-decl name='Value' filepath='src/mongo/logger/log_component.h' line='45' column='1' id='type-id-3355'>
-              <underlying-type type-id='type-id-104'/>
+            <enum-decl name='Value' filepath='src/mongo/logger/log_component.h' line='45' column='1' id='type-id-3380'>
+              <underlying-type type-id='type-id-109'/>
               <enumerator name='kDefault' value='0'/>
               <enumerator name='kAccessControl' value='1'/>
               <enumerator name='kCommand' value='2'/>
@@ -23627,17 +23687,17 @@
             </enum-decl>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_value' type-id='type-id-3355' visibility='default' filepath='src/mongo/logger/log_component.h' line='102' column='1'/>
+            <var-decl name='_value' type-id='type-id-3380' visibility='default' filepath='src/mongo/logger/log_component.h' line='102' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE'>
-              <parameter type-id='type-id-1481' is-artificial='yes'/>
-              <parameter type-id='type-id-3355'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1494' is-artificial='yes'/>
+              <parameter type-id='type-id-3380'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogComponentSettings' size-in-bits='224' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='42' column='1' id='type-id-423'>
+        <class-decl name='LogComponentSettings' size-in-bits='224' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='42' column='1' id='type-id-436'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_hasMinimumLoggedSeverity' type-id='type-id-2' visibility='default' filepath='src/mongo/logger/log_component_settings.h' line='87' column='1'/>
           </data-member>
@@ -23646,1991 +23706,2011 @@
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1483' is-artificial='yes'/>
-              <parameter type-id='type-id-425'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <parameter type-id='type-id-438'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1483' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogComponentSettings' filepath='src/mongo/logger/log_component_settings.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1483' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1496' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-427'>
+        <class-decl name='LogDomain&lt;mongo::logger::MessageEventEphemeral&gt;' size-in-bits='256' visibility='default' filepath='src/mongo/logger/log_domain.h' line='61' column='1' id='type-id-440'>
           <member-type access='private'>
-            <typedef-decl name='AppenderVector' type-id='type-id-1321' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-3356'/>
+            <typedef-decl name='AppenderVector' type-id='type-id-1333' filepath='src/mongo/logger/log_domain.h' line='137' column='1' id='type-id-3381'/>
           </member-type>
           <member-type access='private'>
-            <class-decl name='AppenderHandle' visibility='default' is-declaration-only='yes' id='type-id-3357'/>
+            <class-decl name='AppenderHandle' visibility='default' is-declaration-only='yes' id='type-id-3382'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='AppenderAutoPtr' type-id='type-id-3297' filepath='src/mongo/logger/log_domain.h' line='85' column='1' id='type-id-3358'/>
+            <typedef-decl name='AppenderAutoPtr' type-id='type-id-3322' filepath='src/mongo/logger/log_domain.h' line='85' column='1' id='type-id-3383'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='Event' type-id='type-id-3359' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-2522'/>
+            <typedef-decl name='Event' type-id='type-id-3384' filepath='src/mongo/logger/log_domain.h' line='65' column='1' id='type-id-2543'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_appenders' type-id='type-id-3356' visibility='default' filepath='src/mongo/logger/log_domain.h' line='139' column='1'/>
+            <var-decl name='_appenders' type-id='type-id-3381' visibility='default' filepath='src/mongo/logger/log_domain.h' line='139' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
             <var-decl name='_abortOnFailure' type-id='type-id-1' visibility='default' filepath='src/mongo/logger/log_domain.h' line='140' column='1'/>
           </data-member>
           <member-function access='private'>
             <function-decl name='LogDomain' filepath='src/mongo/logger/log_domain.h' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
-              <parameter type-id='type-id-429'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
+              <parameter type-id='type-id-442'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='LogDomain' filepath='src/mongo/logger/log_domain.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogDomain' filepath='src/mongo/logger/log_domain.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1485' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1498' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-431'>
+        <class-decl name='LogManager' size-in-bits='896' visibility='default' filepath='src/mongo/logger/log_manager.h' line='45' column='1' id='type-id-444'>
           <member-type access='private'>
-            <typedef-decl name='DomainsByNameMap' type-id='type-id-1305' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-3360'/>
+            <typedef-decl name='DomainsByNameMap' type-id='type-id-1317' filepath='src/mongo/logger/log_manager.h' line='65' column='1' id='type-id-3385'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_domains' type-id='type-id-3360' visibility='default' filepath='src/mongo/logger/log_manager.h' line='67' column='1'/>
+            <var-decl name='_domains' type-id='type-id-3385' visibility='default' filepath='src/mongo/logger/log_manager.h' line='67' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='_globalDomain' type-id='type-id-412' visibility='default' filepath='src/mongo/logger/log_manager.h' line='68' column='1'/>
+            <var-decl name='_globalDomain' type-id='type-id-425' visibility='default' filepath='src/mongo/logger/log_manager.h' line='68' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogManager' filepath='src/mongo/logger/log_manager.h' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1489' is-artificial='yes'/>
-              <parameter type-id='type-id-433'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1502' is-artificial='yes'/>
+              <parameter type-id='type-id-446'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogManager' filepath='src/mongo/logger/log_manager.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1489' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1502' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogManager' filepath='src/mongo/logger/log_manager.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1489' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1502' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='getGlobalDomain' mangled-name='_ZN5mongo6logger10LogManager15getGlobalDomainEv' filepath='src/mongo/logger/log_manager.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger10LogManager15getGlobalDomainEv'>
-              <parameter type-id='type-id-1489' is-artificial='yes'/>
-              <return type-id='type-id-1479'/>
+              <parameter type-id='type-id-1502' is-artificial='yes'/>
+              <return type-id='type-id-1492'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogSeverity' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_severity.h' line='44' column='1' id='type-id-434'>
+        <class-decl name='LogSeverity' size-in-bits='32' visibility='default' filepath='src/mongo/logger/log_severity.h' line='44' column='1' id='type-id-447'>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='_severity' type-id='type-id-40' visibility='default' filepath='src/mongo/logger/log_severity.h' line='135' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='LogSeverity' mangled-name='_ZN5mongo6logger11LogSeverityC2Ei' filepath='src/mongo/logger/log_severity.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger11LogSeverityC2Ei'>
-              <parameter type-id='type-id-1490' is-artificial='yes'/>
+              <parameter type-id='type-id-1503' is-artificial='yes'/>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-2675'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' static='yes'>
             <function-decl name='cast' mangled-name='_ZN5mongo6logger11LogSeverity4castEi' filepath='src/mongo/logger/log_severity.h' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger11LogSeverity4castEi'>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-434'/>
+              <return type-id='type-id-447'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='LogstreamBuilder' size-in-bits='384' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='49' column='1' id='type-id-1491'>
+        <class-decl name='LogstreamBuilder' size-in-bits='384' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='49' column='1' id='type-id-1504'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_domain' type-id='type-id-1496' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='226' column='1'/>
+            <var-decl name='_domain' type-id='type-id-1509' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='226' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_contextName' type-id='type-id-2552' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='227' column='1'/>
+            <var-decl name='_contextName' type-id='type-id-2573' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='227' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='128'>
-            <var-decl name='_severity' type-id='type-id-434' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='228' column='1'/>
+            <var-decl name='_severity' type-id='type-id-447' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='228' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='160'>
-            <var-decl name='_component' type-id='type-id-420' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='229' column='1'/>
+            <var-decl name='_component' type-id='type-id-433' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='229' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='192'>
-            <var-decl name='_baseMessage' type-id='type-id-2552' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='230' column='1'/>
+            <var-decl name='_baseMessage' type-id='type-id-2573' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='230' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='256'>
-            <var-decl name='_os' type-id='type-id-1291' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='231' column='1'/>
+            <var-decl name='_os' type-id='type-id-1303' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='231' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='_tee' type-id='type-id-2619' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='232' column='1'/>
+            <var-decl name='_tee' type-id='type-id-2640' visibility='default' filepath='src/mongo/logger/logstream_builder.h' line='232' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='67' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-1496'/>
-              <parameter type-id='type-id-2552'/>
-              <parameter type-id='type-id-434'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-1509'/>
+              <parameter type-id='type-id-2573'/>
+              <parameter type-id='type-id-447'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-1496'/>
-              <parameter type-id='type-id-2552'/>
-              <parameter type-id='type-id-434'/>
-              <parameter type-id='type-id-420'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-1509'/>
+              <parameter type-id='type-id-2573'/>
+              <parameter type-id='type-id-447'/>
+              <parameter type-id='type-id-433'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-1496'/>
-              <parameter type-id='type-id-2554'/>
-              <parameter type-id='type-id-416'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-1509'/>
+              <parameter type-id='type-id-2575'/>
+              <parameter type-id='type-id-429'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-1493'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-1506'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~LogstreamBuilder' filepath='src/mongo/logger/logstream_builder.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' static='yes'>
             <function-decl name='severityCast' mangled-name='_ZN5mongo6logger16LogstreamBuilder12severityCastEi' filepath='src/mongo/logger/logstream_builder.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilder12severityCastEi'>
               <parameter type-id='type-id-40'/>
-              <return type-id='type-id-434'/>
+              <return type-id='type-id-447'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEPKc' filepath='src/mongo/logger/logstream_builder.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsEPKc'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-58'/>
-              <return type-id='type-id-1492'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-63'/>
+              <return type-id='type-id-1505'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKSs' filepath='src/mongo/logger/logstream_builder.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsERKSs'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <parameter type-id='type-id-2554'/>
-              <return type-id='type-id-1492'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <parameter type-id='type-id-2575'/>
+              <return type-id='type-id-1505'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilder6streamEv'>
-              <parameter type-id='type-id-1494' is-artificial='yes'/>
-              <return type-id='type-id-2644'/>
+              <parameter type-id='type-id-1507' is-artificial='yes'/>
+              <return type-id='type-id-2666'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='MessageLogDomain' type-id='type-id-427' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1495'/>
-        <class-decl name='Appender&lt;mongo::logger::MessageEventEphemeral&gt;' visibility='default' is-declaration-only='yes' id='type-id-2611'/>
-        <class-decl name='MessageEventEphemeral' visibility='default' is-declaration-only='yes' id='type-id-3359'/>
-        <class-decl name='Tee' visibility='default' is-declaration-only='yes' id='type-id-2618'/>
+        <typedef-decl name='MessageLogDomain' type-id='type-id-440' filepath='src/mongo/logger/message_log_domain.h' line='40' column='1' id='type-id-1508'/>
+        <class-decl name='Appender&lt;mongo::logger::MessageEventEphemeral&gt;' visibility='default' is-declaration-only='yes' id='type-id-2632'/>
+        <class-decl name='MessageEventEphemeral' visibility='default' is-declaration-only='yes' id='type-id-3384'/>
+        <class-decl name='Tee' visibility='default' is-declaration-only='yes' id='type-id-2639'/>
         <function-decl name='globalLogDomain' mangled-name='_ZN5mongo6logger15globalLogDomainEv' filepath='src/mongo/logger/logger.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger15globalLogDomainEv'>
-          <return type-id='type-id-1479'/>
+          <return type-id='type-id-1492'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='stdx'>
-        <typedef-decl name='condition_variable' type-id='type-id-1102' filepath='src/mongo/stdx/condition_variable.h' line='36' column='1' id='type-id-3349'/>
-        <typedef-decl name='thread' type-id='type-id-1211' filepath='src/mongo/stdx/thread.h' line='36' column='1' id='type-id-3351'/>
+        <typedef-decl name='condition_variable' type-id='type-id-1114' filepath='src/mongo/stdx/condition_variable.h' line='36' column='1' id='type-id-3374'/>
+        <typedef-decl name='thread' type-id='type-id-1223' filepath='src/mongo/stdx/thread.h' line='36' column='1' id='type-id-3376'/>
       </namespace-decl>
       <function-decl name='intrusive_ptr_add_ref' mangled-name='_ZN5mongo21intrusive_ptr_add_refEPNS_12SharedBuffer6HolderE' filepath='src/mongo/util/shared_buffer.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21intrusive_ptr_add_refEPNS_12SharedBuffer6HolderE'>
-        <parameter type-id='type-id-1441' name='h' filepath='src/mongo/util/shared_buffer.h' line='89' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1454' name='h' filepath='src/mongo/util/shared_buffer.h' line='89' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='intrusive_ptr_release' mangled-name='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE' filepath='src/mongo/util/shared_buffer.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo21intrusive_ptr_releaseEPNS_12SharedBuffer6HolderE'>
-        <parameter type-id='type-id-1441' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1454' name='h' filepath='src/mongo/util/shared_buffer.h' line='93' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='mongoutils'>
       <namespace-decl name='str'>
-        <class-decl name='stream' size-in-bits='256' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='56' column='1' id='type-id-449'>
+        <class-decl name='stream' size-in-bits='256' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='56' column='1' id='type-id-461'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='ss' type-id='type-id-1452' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='58' column='1'/>
+            <var-decl name='ss' type-id='type-id-1465' visibility='default' filepath='src/mongo/util/mongoutils/str.h' line='58' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [20]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA20_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA20_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-277'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-290'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;unsigned long&gt;' mangled-name='_ZN10mongoutils3str6streamlsImEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsImEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-1335'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-1347'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [19]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA19_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA19_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-276'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-289'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [22]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA22_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA22_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-278'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-291'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [15]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA15_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA15_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-275'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-288'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [8]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA8_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA8_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-280'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-293'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [7]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA7_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIA7_cEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-279'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-292'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;long&gt;' mangled-name='_ZN10mongoutils3str6streamlsIlEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIlEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-285'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-298'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;bool&gt;' mangled-name='_ZN10mongoutils3str6streamlsIbEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsIbEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-237'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-250'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;std::basic_string&lt;char&gt; &gt;' mangled-name='_ZN10mongoutils3str6streamlsISsEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10mongoutils3str6streamlsISsEERS1_RKT_'>
-              <parameter type-id='type-id-1515' is-artificial='yes'/>
-              <parameter type-id='type-id-2551'/>
-              <return type-id='type-id-1514'/>
+              <parameter type-id='type-id-1528' is-artificial='yes'/>
+              <parameter type-id='type-id-2572'/>
+              <return type-id='type-id-1527'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator basic_string' mangled-name='_ZNK10mongoutils3str6streamcvSsEv' filepath='src/mongo/util/mongoutils/str.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK10mongoutils3str6streamcvSsEv'>
-              <parameter type-id='type-id-451' is-artificial='yes'/>
-              <return type-id='type-id-2552'/>
+              <parameter type-id='type-id-463' is-artificial='yes'/>
+              <return type-id='type-id-2573'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='intrusive_ptr&lt;mongo::SharedBuffer::Holder&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='52' column='1' id='type-id-147'>
+      <class-decl name='intrusive_ptr&lt;mongo::SharedBuffer::Holder&gt;' size-in-bits='64' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='52' column='1' id='type-id-160'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='px' type-id='type-id-1441' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
+          <var-decl name='px' type-id='type-id-1454' visibility='default' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='190' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2Ev'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-1441'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-239'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-252'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEED2Ev'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-149'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-162'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/detail/operator_bool.hpp' line='11' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEcvbEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
+            <parameter type-id='type-id-253' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEptEv' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEptEv'>
-            <parameter type-id='type-id-240' is-artificial='yes'/>
-            <return type-id='type-id-1441'/>
+            <parameter type-id='type-id-253' is-artificial='yes'/>
+            <return type-id='type-id-1454'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEE4swapERS4_'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-148'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-161'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-1441'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-1454'/>
             <parameter type-id='type-id-1'/>
-            <return type-id='type-id-2675'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-239'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-252'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='intrusive_ptr' filepath='src/third_party/boost-1.56.0/boost/smart_ptr/intrusive_ptr.hpp' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-150' is-artificial='yes'/>
-            <parameter type-id='type-id-149'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-163' is-artificial='yes'/>
+            <parameter type-id='type-id-162'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='optional&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-151'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-169'/>
+      <class-decl name='optional&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-164'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-182'/>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-3362' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3361'/>
+          <typedef-decl name='argument_type' type-id='type-id-3387' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3386'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_const_type' type-id='type-id-3364' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3363'/>
+          <typedef-decl name='pointer_const_type' type-id='type-id-3389' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3388'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_type' type-id='type-id-3366' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3365'/>
+          <typedef-decl name='pointer_type' type-id='type-id-3391' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3390'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_const_type' type-id='type-id-3368' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3367'/>
+          <typedef-decl name='reference_const_type' type-id='type-id-3393' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3392'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-3370' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3369'/>
+          <typedef-decl name='reference_type' type-id='type-id-3395' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3394'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3372' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3371'/>
+          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3397' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3396'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-3374' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3373'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-3399' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3398'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2Ev'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-3400'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <parameter type-id='type-id-3361'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-3386'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <parameter type-id='type-id-3373'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-3398'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <parameter type-id='type-id-3361'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3386'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2ERKS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='849' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2ERKS4_'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-255'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2EOS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='854' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEEC2EOS4_'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <parameter type-id='type-id-153'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <parameter type-id='type-id-166'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~optional' mangled-name='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor21RemoteCommandResponseEED2Ev'>
-            <parameter type-id='type-id-154' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-167' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKR5boost8optionalIN5mongo8executor21RemoteCommandResponseEEdeEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='1015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKR5boost8optionalIN5mongo8executor21RemoteCommandResponseEEdeEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
-            <return type-id='type-id-3367'/>
+            <parameter type-id='type-id-256' is-artificial='yes'/>
+            <return type-id='type-id-3392'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost8optionalIN5mongo8executor21RemoteCommandResponseEE3getEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='998' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost8optionalIN5mongo8executor21RemoteCommandResponseEE3getEv'>
-            <parameter type-id='type-id-243' is-artificial='yes'/>
-            <return type-id='type-id-3367'/>
+            <parameter type-id='type-id-256' is-artificial='yes'/>
+            <return type-id='type-id-3392'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='optional&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-155'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-174'/>
+      <class-decl name='optional&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-168'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-187'/>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-3376' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3375'/>
+          <typedef-decl name='argument_type' type-id='type-id-3402' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3401'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_const_type' type-id='type-id-3378' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3377'/>
+          <typedef-decl name='pointer_const_type' type-id='type-id-3404' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3403'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_type' type-id='type-id-3380' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3379'/>
+          <typedef-decl name='pointer_type' type-id='type-id-3406' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3405'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_const_type' type-id='type-id-3382' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3381'/>
+          <typedef-decl name='reference_const_type' type-id='type-id-3408' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3407'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-3384' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3383'/>
+          <typedef-decl name='reference_type' type-id='type-id-3410' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3409'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3386' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3385'/>
+          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3412' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3411'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-3388' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3387'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-3414' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3413'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3400'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-3375'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEC2EOS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEC2EOS4_'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-3387'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <parameter type-id='type-id-3375'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='849' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-245'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-258'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='854' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-170'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='1016' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNR5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-3383'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-3409'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEE3getEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEE3getEv'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-3383'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-3409'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3400'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-3375'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-3387'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-3413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <parameter type-id='type-id-3375'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3401'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='849' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-245'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-258'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='854' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <parameter type-id='type-id-170'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='861' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-158' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-171' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKR5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='1015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKR5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv'>
-            <parameter type-id='type-id-246' is-artificial='yes'/>
-            <return type-id='type-id-3381'/>
+            <parameter type-id='type-id-259' is-artificial='yes'/>
+            <return type-id='type-id-3407'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEE3getEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='998' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost8optionalIN5mongo8executor12TaskExecutor14CallbackHandleEE3getEv'>
-            <parameter type-id='type-id-246' is-artificial='yes'/>
-            <return type-id='type-id-3381'/>
+            <parameter type-id='type-id-259' is-artificial='yes'/>
+            <return type-id='type-id-3407'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='optional&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-159'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-179'/>
+      <class-decl name='optional&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='749' column='1' id='type-id-172'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-192'/>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-3390' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3389'/>
+          <typedef-decl name='argument_type' type-id='type-id-3416' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='766' column='1' id='type-id-3415'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_const_type' type-id='type-id-3392' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3391'/>
+          <typedef-decl name='pointer_const_type' type-id='type-id-3418' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='765' column='1' id='type-id-3417'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer_type' type-id='type-id-3394' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3393'/>
+          <typedef-decl name='pointer_type' type-id='type-id-3420' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='764' column='1' id='type-id-3419'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_const_type' type-id='type-id-3396' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3395'/>
+          <typedef-decl name='reference_const_type' type-id='type-id-3422' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='759' column='1' id='type-id-3421'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-3398' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3397'/>
+          <typedef-decl name='reference_type' type-id='type-id-3424' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='758' column='1' id='type-id-3423'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3400' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3399'/>
+          <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3426' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='762' column='1' id='type-id-3425'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='rval_reference_type' type-id='type-id-3402' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3401'/>
+          <typedef-decl name='rval_reference_type' type-id='type-id-3428' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='761' column='1' id='type-id-3427'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2Ev'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3400'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-3389'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS4_'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-3401'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3427'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <parameter type-id='type-id-3389'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='849' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-248'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='854' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-161'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-174'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEED2Ev'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEdeEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='1016' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNR5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEdeEv'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-3397'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-3423'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEE3getEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEE3getEv'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-3397'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-3423'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='770' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='774' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3400'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-3389'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-3401'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-3427'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
             <parameter type-id='type-id-1'/>
-            <parameter type-id='type-id-3389'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3415'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='849' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-248'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-261'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='854' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS5_'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-161'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-174'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~optional' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='861' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEaSEOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost8optionalIN5mongo8executor12TaskExecutor11EventHandleEEaSEOS5_'>
-            <parameter type-id='type-id-162' is-artificial='yes'/>
-            <parameter type-id='type-id-161'/>
-            <return type-id='type-id-160'/>
+            <parameter type-id='type-id-175' is-artificial='yes'/>
+            <parameter type-id='type-id-174'/>
+            <return type-id='type-id-173'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='type_with_alignment&lt;8&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3403'>
+      <class-decl name='type_with_alignment&lt;8&gt;' size-in-bits='8' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3429'>
         <member-type access='private'>
-          <typedef-decl name='type' type-id='type-id-3405' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3404'/>
+          <typedef-decl name='type' type-id='type-id-3431' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='193' column='1' id='type-id-3430'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3406'>
+      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3432'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-151' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-184'/>
+          <typedef-decl name='type' type-id='type-id-164' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-197'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandResponse &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3407'>
+      <class-decl name='remove_reference&lt;mongo::executor::RemoteCommandResponse &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3433'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3408'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3434'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3409'>
+      <class-decl name='remove_reference&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3435'>
       </class-decl>
+      <typedef-decl name='none_t' type-id='type-id-42' filepath='src/third_party/boost-1.56.0/boost/none_t.hpp' line='19' column='1' id='type-id-3400'/>
       <namespace-decl name='detail'>
-        <class-decl name='make_reference_content&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3410'>
+        <class-decl name='make_reference_content&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3436'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-388' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-186'/>
+            <typedef-decl name='type' type-id='type-id-401' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-199'/>
           </member-type>
         </class-decl>
-        <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3411'>
+        <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3437'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-398' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-188'/>
+            <typedef-decl name='type' type-id='type-id-411' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-201'/>
           </member-type>
         </class-decl>
-        <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3412'>
+        <class-decl name='make_reference_content&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='78' column='1' id='type-id-3438'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-402' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-190'/>
+            <typedef-decl name='type' type-id='type-id-415' filepath='src/third_party/boost-1.56.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-203'/>
           </member-type>
         </class-decl>
+        <class-decl name='none_helper' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-41'/>
       </namespace-decl>
       <namespace-decl name='move_detail'>
-        <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/move/detail/meta_utils.hpp' line='45' column='1' id='type-id-3413'>
+        <class-decl name='enable_if_c&lt;true, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/move/detail/meta_utils.hpp' line='45' column='1' id='type-id-3439'>
         </class-decl>
       </namespace-decl>
       <function-decl name='move&lt;boost::optional&lt;mongo::executor::RemoteCommandResponse&gt; &amp;&gt;' mangled-name='_ZN5boost4moveIRNS_8optionalIN5mongo8executor21RemoteCommandResponseEEEEEONS_16remove_referenceIT_E4typeEOS8_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRNS_8optionalIN5mongo8executor21RemoteCommandResponseEEEEEONS_16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-152' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-185'/>
+        <parameter type-id='type-id-165' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <return type-id='type-id-198'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::RemoteCommandResponse &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor21RemoteCommandResponseEEEONS_16remove_referenceIT_E4typeEOS6_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor21RemoteCommandResponseEEEONS_16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-1465' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-187'/>
+        <parameter type-id='type-id-1478' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <return type-id='type-id-200'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEEONS_16remove_referenceIT_E4typeEOS7_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor12TaskExecutor14CallbackHandleEEEONS_16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-1471' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-189'/>
+        <parameter type-id='type-id-1484' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <return type-id='type-id-202'/>
       </function-decl>
       <function-decl name='move&lt;mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZN5boost4moveIRN5mongo8executor12TaskExecutor11EventHandleEEEONS_16remove_referenceIT_E4typeEOS7_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRN5mongo8executor12TaskExecutor11EventHandleEEEONS_16remove_referenceIT_E4typeEOS7_'>
-        <parameter type-id='type-id-1474' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-191'/>
+        <parameter type-id='type-id-1487' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <return type-id='type-id-204'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN5boost7forwardIN5mongo8executor12TaskExecutor14CallbackHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost7forwardIN5mongo8executor12TaskExecutor14CallbackHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE'>
-        <parameter type-id='type-id-1471' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
-        <parameter type-id='type-id-2516' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
-        <return type-id='type-id-1472'/>
+        <parameter type-id='type-id-1484' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
+        <parameter type-id='type-id-2537' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
+        <return type-id='type-id-1485'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::executor::TaskExecutor::EventHandle, mongo::executor::TaskExecutor::EventHandle &amp;&gt;' mangled-name='_ZN5boost7forwardIN5mongo8executor12TaskExecutor11EventHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost7forwardIN5mongo8executor12TaskExecutor11EventHandleERS4_EEOT_OT0_PNS_11move_detail11enable_if_cIXqusr11move_detail19is_lvalue_referenceIS6_EE5valuesr11move_detail19is_lvalue_referenceIS8_EE5valueLb1EEvE4typeE'>
-        <parameter type-id='type-id-1474' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
-        <parameter type-id='type-id-2516' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
-        <return type-id='type-id-1475'/>
+        <parameter type-id='type-id-1487' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='176' column='1'/>
+        <parameter type-id='type-id-2537' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='178' column='1'/>
+        <return type-id='type-id-1488'/>
       </function-decl>
       <namespace-decl name='optional_detail'>
-        <class-decl name='aligned_storage&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-163'>
+        <class-decl name='aligned_storage&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-176'>
           <member-type access='private'>
-            <union-decl name='dummy_u' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3414'>
+            <union-decl name='dummy_u' size-in-bits='320' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3440'>
               <data-member access='public'>
                 <var-decl name='data' type-id='type-id-19' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
               <data-member access='public'>
-                <var-decl name='aligner_' type-id='type-id-3404' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
+                <var-decl name='aligner_' type-id='type-id-3430' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='dummy_' type-id='type-id-3414' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
+            <var-decl name='dummy_' type-id='type-id-3440' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor21RemoteCommandResponseEE7addressEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor21RemoteCommandResponseEE7addressEv'>
-              <parameter type-id='type-id-164' is-artificial='yes'/>
-              <return type-id='type-id-52'/>
+              <parameter type-id='type-id-177' is-artificial='yes'/>
+              <return type-id='type-id-57'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZNK5boost15optional_detail15aligned_storageIN5mongo8executor21RemoteCommandResponseEE7addressEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail15aligned_storageIN5mongo8executor21RemoteCommandResponseEE7addressEv'>
-              <parameter type-id='type-id-251' is-artificial='yes'/>
-              <return type-id='type-id-52'/>
+              <parameter type-id='type-id-264' is-artificial='yes'/>
+              <return type-id='type-id-57'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-165'>
+        <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-178'>
           <member-type access='private'>
-            <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3415'>
+            <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3441'>
               <data-member access='public'>
                 <var-decl name='data' type-id='type-id-11' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
               <data-member access='public'>
-                <var-decl name='aligner_' type-id='type-id-3404' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
+                <var-decl name='aligner_' type-id='type-id-3430' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='dummy_' type-id='type-id-3415' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
+            <var-decl name='dummy_' type-id='type-id-3441' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressEv'>
-              <parameter type-id='type-id-166' is-artificial='yes'/>
-              <return type-id='type-id-52'/>
+              <parameter type-id='type-id-179' is-artificial='yes'/>
+              <return type-id='type-id-57'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZNK5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressEv'>
-              <parameter type-id='type-id-253' is-artificial='yes'/>
-              <return type-id='type-id-52'/>
+              <parameter type-id='type-id-266' is-artificial='yes'/>
+              <return type-id='type-id-57'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-167'>
+        <class-decl name='aligned_storage&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='120' column='1' id='type-id-180'>
           <member-type access='private'>
-            <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3416'>
+            <union-decl name='dummy_u' size-in-bits='128' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='128' column='1' id='type-id-3442'>
               <data-member access='public'>
                 <var-decl name='data' type-id='type-id-11' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='130' column='1'/>
               </data-member>
               <data-member access='public'>
-                <var-decl name='aligner_' type-id='type-id-3404' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
+                <var-decl name='aligner_' type-id='type-id-3430' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='132' column='1'/>
               </data-member>
             </union-decl>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='dummy_' type-id='type-id-3416' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
+            <var-decl name='dummy_' type-id='type-id-3442' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='133' column='1'/>
           </data-member>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor11EventHandleEE7addressEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail15aligned_storageIN5mongo8executor12TaskExecutor11EventHandleEE7addressEv'>
-              <parameter type-id='type-id-168' is-artificial='yes'/>
-              <return type-id='type-id-52'/>
+              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <return type-id='type-id-57'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='optional_base&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-169'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3417'/>
+        <class-decl name='optional_base&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='384' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-182'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3443'/>
           <member-type access='private'>
-            <typedef-decl name='argument_type' type-id='type-id-3418' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3362'/>
+            <typedef-decl name='argument_type' type-id='type-id-3444' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3387'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-186' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-172'/>
+            <typedef-decl name='internal_type' type-id='type-id-199' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-185'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-3419' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3364'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-3445' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3389'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_type' type-id='type-id-3420' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3366'/>
+            <typedef-decl name='pointer_type' type-id='type-id-3446' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3391'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_const_type' type-id='type-id-3421' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3368'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-3447' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3393'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-3422' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3370'/>
+            <typedef-decl name='reference_type' type-id='type-id-3448' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3395'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3423' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3372'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3449' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3397'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-3424' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3374'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-3450' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3399'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='storage_type' type-id='type-id-163' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3425'/>
+            <typedef-decl name='storage_type' type-id='type-id-176' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3451'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='m_initialized' type-id='type-id-1' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='742' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='m_storage' type-id='type-id-3425' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
+            <var-decl name='m_storage' type-id='type-id-3451' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
           </data-member>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2Ev'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-3400'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-3362'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-3387'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-3374'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-3399'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
-              <parameter type-id='type-id-3362'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3387'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2ERKS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2ERKS5_'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-257'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-270'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2EOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEEC2EOS5_'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-170'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-183'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEED2Ev'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE10get_objectEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE10get_objectEv'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-173'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-186'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE10get_objectEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='705' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE10get_objectEv'>
-              <parameter type-id='type-id-258' is-artificial='yes'/>
-              <return type-id='type-id-260'/>
+              <parameter type-id='type-id-271' is-artificial='yes'/>
+              <return type-id='type-id-273'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE7destroyEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE7destroyEv'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE12destroy_implEN4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_ptr_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE12get_ptr_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE12get_ptr_implEv'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-3366'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-3391'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='cast_ptr' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8cast_ptrEPS4_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8cast_ptrEPS4_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-173'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3366'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-186'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3391'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE14is_initializedEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE14is_initializedEv'>
-              <parameter type-id='type-id-258' is-artificial='yes'/>
+              <parameter type-id='type-id-271' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE9constructERKS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='470' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE9constructERKS4_'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-3362'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-3387'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8get_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8get_implEv'>
-              <parameter type-id='type-id-258' is-artificial='yes'/>
-              <return type-id='type-id-3368'/>
+              <parameter type-id='type-id-271' is-artificial='yes'/>
+              <return type-id='type-id-3393'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE11dereferenceEPKS4_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE11dereferenceEPKS4_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-258' is-artificial='yes'/>
-              <parameter type-id='type-id-260'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3368'/>
+              <parameter type-id='type-id-271' is-artificial='yes'/>
+              <parameter type-id='type-id-273'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3393'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE9constructEOS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE9constructEOS4_'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-3374'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-3399'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8get_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE8get_implEv'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <return type-id='type-id-3370'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <return type-id='type-id-3395'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE11dereferenceEPS4_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor21RemoteCommandResponseEE11dereferenceEPS4_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-171' is-artificial='yes'/>
-              <parameter type-id='type-id-173'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3370'/>
+              <parameter type-id='type-id-184' is-artificial='yes'/>
+              <parameter type-id='type-id-186'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3395'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-174'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3417'/>
+        <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-187'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3443'/>
           <member-type access='private'>
-            <typedef-decl name='argument_type' type-id='type-id-3426' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3376'/>
+            <typedef-decl name='argument_type' type-id='type-id-3452' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3402'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-188' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-177'/>
+            <typedef-decl name='internal_type' type-id='type-id-201' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-190'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-3427' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3378'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-3453' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3404'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_type' type-id='type-id-3428' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3380'/>
+            <typedef-decl name='pointer_type' type-id='type-id-3454' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3406'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_const_type' type-id='type-id-3429' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3382'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-3455' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3408'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-3430' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3384'/>
+            <typedef-decl name='reference_type' type-id='type-id-3456' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3410'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3431' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3386'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3457' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3412'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-3432' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3388'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-3458' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3414'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='storage_type' type-id='type-id-165' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3433'/>
+            <typedef-decl name='storage_type' type-id='type-id-178' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3459'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='m_initialized' type-id='type-id-1' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='742' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='m_storage' type-id='type-id-3433' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
+            <var-decl name='m_storage' type-id='type-id-3459' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
           </data-member>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3400'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-3376'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3402'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEEC2EOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEEC2EOS5_'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-3388'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3414'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
-              <parameter type-id='type-id-3376'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3402'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-262'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-275'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-175'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-188'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE10get_objectEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE10get_objectEv'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-178'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-191'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyEv'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE12destroy_implEN4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_ptr_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE12get_ptr_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE12get_ptr_implEv'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-3380'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-3406'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='cast_ptr' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8cast_ptrEPS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8cast_ptrEPS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-178'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3380'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-191'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3406'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructEOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructEOS5_'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-3388'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3414'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE14is_initializedEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE14is_initializedEv'>
-              <parameter type-id='type-id-263' is-artificial='yes'/>
+              <parameter type-id='type-id-276' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8get_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8get_implEv'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-3384'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-3410'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE11dereferenceEPS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE11dereferenceEPS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-178'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3384'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-191'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3410'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3400'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-3376'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3402'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-3388'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-3414'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
-              <parameter type-id='type-id-3376'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3402'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-262'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-275'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <parameter type-id='type-id-175'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <parameter type-id='type-id-188'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-176' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-189' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE10get_objectEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='705' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE10get_objectEv'>
-              <parameter type-id='type-id-263' is-artificial='yes'/>
-              <return type-id='type-id-265'/>
+              <parameter type-id='type-id-276' is-artificial='yes'/>
+              <return type-id='type-id-278'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8get_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE8get_implEv'>
-              <parameter type-id='type-id-263' is-artificial='yes'/>
-              <return type-id='type-id-3382'/>
+              <parameter type-id='type-id-276' is-artificial='yes'/>
+              <return type-id='type-id-3408'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE11dereferenceEPKS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor14CallbackHandleEE11dereferenceEPKS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-263' is-artificial='yes'/>
-              <parameter type-id='type-id-265'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3382'/>
+              <parameter type-id='type-id-276' is-artificial='yes'/>
+              <parameter type-id='type-id-278'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3408'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-179'>
-          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3417'/>
+        <class-decl name='optional_base&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='192' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='204' column='1' id='type-id-192'>
+          <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3443'/>
           <member-type access='private'>
-            <typedef-decl name='argument_type' type-id='type-id-3434' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3390'/>
+            <typedef-decl name='argument_type' type-id='type-id-3460' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='242' column='1' id='type-id-3416'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-190' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-182'/>
+            <typedef-decl name='internal_type' type-id='type-id-203' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='212' column='1' id='type-id-195'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-3435' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3392'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-3461' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='241' column='1' id='type-id-3418'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='pointer_type' type-id='type-id-3436' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3394'/>
+            <typedef-decl name='pointer_type' type-id='type-id-3462' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='240' column='1' id='type-id-3420'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_const_type' type-id='type-id-3437' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3396'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-3463' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='235' column='1' id='type-id-3422'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type' type-id='type-id-3438' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3398'/>
+            <typedef-decl name='reference_type' type-id='type-id-3464' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='234' column='1' id='type-id-3424'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3439' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3400'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-3465' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='238' column='1' id='type-id-3426'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-3440' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3402'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-3466' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='237' column='1' id='type-id-3428'/>
           </member-type>
           <member-type access='private'>
-            <typedef-decl name='storage_type' type-id='type-id-167' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3441'/>
+            <typedef-decl name='storage_type' type-id='type-id-180' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='214' column='1' id='type-id-3467'/>
           </member-type>
           <data-member access='private' layout-offset-in-bits='0'>
             <var-decl name='m_initialized' type-id='type-id-1' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='742' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='m_storage' type-id='type-id-3441' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
+            <var-decl name='m_storage' type-id='type-id-3467' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='743' column='1'/>
           </data-member>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2Ev'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3400'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3390'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3416'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS5_'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3402'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3428'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
-              <parameter type-id='type-id-3390'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3416'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-267'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-280'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-180'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-193'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEED2Ev' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEED2Ev'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE10get_objectEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE10get_objectEv'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-183'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-196'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE14is_initializedEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE14is_initializedEv'>
-              <parameter type-id='type-id-268' is-artificial='yes'/>
+              <parameter type-id='type-id-281' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE8get_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE8get_implEv'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-3398'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-3424'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE11dereferenceEPS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE11dereferenceEPS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-183'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3398'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-196'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3424'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='destroy' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE7destroyEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE7destroyEv'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12destroy_implEN4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_ptr_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12get_ptr_implEv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12get_ptr_implEv'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-3394'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-3420'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='cast_ptr' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE8cast_ptrEPS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE8cast_ptrEPS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-183'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-3394'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-196'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-3420'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE9constructEOS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE9constructEOS5_'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3402'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3428'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3400'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3390'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3416'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3402'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3428'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='278' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
               <parameter type-id='type-id-1'/>
-              <parameter type-id='type-id-3390'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3416'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-267'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-280'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS6_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEEC2EOS6_'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-180'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-193'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes'>
             <function-decl name='~optional_base' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='assign' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE6assignEOS6_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE6assignEOS6_'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-180'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-193'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='assign_value' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12assign_valueEOS5_N4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail13optional_baseIN5mongo8executor12TaskExecutor11EventHandleEE12assign_valueEOS5_N4mpl_5bool_ILb0EEE'>
-              <parameter type-id='type-id-181' is-artificial='yes'/>
-              <parameter type-id='type-id-3402'/>
-              <parameter type-id='type-id-85'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-194' is-artificial='yes'/>
+              <parameter type-id='type-id-3428'/>
+              <parameter type-id='type-id-90'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='optional_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='201' column='1' id='type-id-3417'/>
-        <class-decl name='types_when_isnt_ref&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3442'>
+        <class-decl name='optional_tag' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='201' column='1' id='type-id-3443'/>
+        <class-decl name='types_when_isnt_ref&lt;mongo::executor::RemoteCommandResponse&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3468'>
           <member-type access='public'>
-            <typedef-decl name='argument_type' type-id='type-id-390' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3418'/>
+            <typedef-decl name='argument_type' type-id='type-id-403' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3444'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-391' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3419'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-404' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3445'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1467' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3420'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1480' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3446'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_const_type' type-id='type-id-390' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3421'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-403' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3447'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1465' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3422'/>
+            <typedef-decl name='reference_type' type-id='type-id-1478' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3448'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1466' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3423'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1479' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3449'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1466' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3424'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1479' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3450'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor21RemoteCommandResponseEE4moveERS4_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor21RemoteCommandResponseEE4moveERS4_'>
-              <parameter type-id='type-id-3422'/>
-              <return type-id='type-id-3424'/>
+              <parameter type-id='type-id-3448'/>
+              <return type-id='type-id-3450'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3443'>
+        <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3469'>
           <member-type access='public'>
-            <typedef-decl name='argument_type' type-id='type-id-400' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3426'/>
+            <typedef-decl name='argument_type' type-id='type-id-413' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3452'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-401' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3427'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-414' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3453'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1473' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3428'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1486' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3454'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_const_type' type-id='type-id-400' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3429'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-413' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3455'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1471' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3430'/>
+            <typedef-decl name='reference_type' type-id='type-id-1484' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3456'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1472' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3431'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1485' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3457'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1472' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3432'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1485' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3458'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor14CallbackHandleEE4moveERS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor14CallbackHandleEE4moveERS5_'>
-              <parameter type-id='type-id-3430'/>
-              <return type-id='type-id-3432'/>
+              <parameter type-id='type-id-3456'/>
+              <return type-id='type-id-3458'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3444'>
+        <class-decl name='types_when_isnt_ref&lt;mongo::executor::TaskExecutor::EventHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='154' column='1' id='type-id-3470'>
           <member-type access='public'>
-            <typedef-decl name='argument_type' type-id='type-id-404' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3434'/>
+            <typedef-decl name='argument_type' type-id='type-id-417' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='171' column='1' id='type-id-3460'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_const_type' type-id='type-id-405' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3435'/>
+            <typedef-decl name='pointer_const_type' type-id='type-id-418' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='169' column='1' id='type-id-3461'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='pointer_type' type-id='type-id-1476' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3436'/>
+            <typedef-decl name='pointer_type' type-id='type-id-1489' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='170' column='1' id='type-id-3462'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_const_type' type-id='type-id-404' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3437'/>
+            <typedef-decl name='reference_const_type' type-id='type-id-417' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='156' column='1' id='type-id-3463'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-1474' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3438'/>
+            <typedef-decl name='reference_type' type-id='type-id-1487' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='157' column='1' id='type-id-3464'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1475' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3439'/>
+            <typedef-decl name='reference_type_of_temporary_wrapper' type-id='type-id-1488' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='160' column='1' id='type-id-3465'/>
           </member-type>
           <member-type access='public'>
-            <typedef-decl name='rval_reference_type' type-id='type-id-1475' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3440'/>
+            <typedef-decl name='rval_reference_type' type-id='type-id-1488' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='159' column='1' id='type-id-3466'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='move' mangled-name='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor11EventHandleEE4moveERS5_' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail19types_when_isnt_refIN5mongo8executor12TaskExecutor11EventHandleEE4moveERS5_'>
-              <parameter type-id='type-id-3438'/>
-              <return type-id='type-id-3440'/>
+              <parameter type-id='type-id-3464'/>
+              <return type-id='type-id-3466'/>
             </function-decl>
           </member-function>
         </class-decl>
         <function-decl name='prevent_binding_rvalue_ref_to_optional_lvalue_ref&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle &amp;&amp;&gt;' mangled-name='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor14CallbackHandleEOS5_EEvv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor14CallbackHandleEOS5_EEvv'>
-          <return type-id='type-id-2675'/>
+          <return type-id='type-id-2697'/>
         </function-decl>
         <function-decl name='prevent_binding_rvalue_ref_to_optional_lvalue_ref&lt;mongo::executor::TaskExecutor::EventHandle, mongo::executor::TaskExecutor::EventHandle &amp;&amp;&gt;' mangled-name='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor11EventHandleEOS5_EEvv' filepath='src/third_party/boost-1.56.0/boost/optional/optional.hpp' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost15optional_detail49prevent_binding_rvalue_ref_to_optional_lvalue_refIN5mongo8executor12TaskExecutor11EventHandleEOS5_EEvv'>
-          <return type-id='type-id-2675'/>
+          <return type-id='type-id-2697'/>
         </function-decl>
       </namespace-decl>
       <namespace-decl name='tt_align_ns'>
-        <class-decl name='a8' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='183' column='1' id='type-id-3405'/>
+        <class-decl name='a8' size-in-bits='64' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/type_with_alignment.hpp' line='183' column='1' id='type-id-3431'/>
       </namespace-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
-      <class-decl name='bool_&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-452'>
+      <class-decl name='bool_&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-464'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-236' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
+          <var-decl name='value' type-id='type-id-249' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-455'>
+      <class-decl name='bool_&lt;true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='23' column='1' id='type-id-467'>
         <data-member access='public' static='yes'>
-          <var-decl name='value' type-id='type-id-236' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
+          <var-decl name='value' type-id='type-id-249' visibility='default' filepath='src/third_party/boost-1.56.0/boost/mpl/bool.hpp' line='25' column='1'/>
         </data-member>
       </class-decl>
-      <typedef-decl name='false_' type-id='type-id-452' filepath='src/third_party/boost-1.56.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-84'/>
-      <typedef-decl name='true_' type-id='type-id-455' filepath='src/third_party/boost-1.56.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-86'/>
+      <typedef-decl name='false_' type-id='type-id-464' filepath='src/third_party/boost-1.56.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-89'/>
+      <typedef-decl name='true_' type-id='type-id-467' filepath='src/third_party/boost-1.56.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-91'/>
     </namespace-decl>
-    <type-decl name='variadic parameter type' id='type-id-3445'/>
-    <type-decl name='void' id='type-id-2675'/>
-    <pointer-type-def type-id='type-id-2675' id='type-id-52'/>
-    <function-type size-in-bits='64' id='type-id-143'>
-      <parameter type-id='type-id-1517'/>
-      <parameter type-id='type-id-460'/>
-      <parameter type-id='type-id-2748'/>
+    <type-decl name='variadic parameter type' id='type-id-3471'/>
+    <type-decl name='void' id='type-id-2697'/>
+    <pointer-type-def type-id='type-id-2697' id='type-id-57'/>
+    <function-type size-in-bits='64' id='type-id-156'>
+      <parameter type-id='type-id-1530'/>
+      <parameter type-id='type-id-472'/>
+      <parameter type-id='type-id-2770'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1512'>
-      <parameter type-id='type-id-460'/>
-      <parameter type-id='type-id-2590'/>
-      <parameter type-id='type-id-356'/>
-      <return type-id='type-id-2770'/>
+    <function-type size-in-bits='64' id='type-id-1525'>
+      <parameter type-id='type-id-472'/>
+      <parameter type-id='type-id-2611'/>
+      <parameter type-id='type-id-369'/>
+      <return type-id='type-id-2792'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1402'>
-      <parameter type-id='type-id-52'/>
-      <parameter type-id='type-id-52'/>
+    <function-type size-in-bits='64' id='type-id-1414'>
+      <parameter type-id='type-id-57'/>
+      <parameter type-id='type-id-57'/>
       <return type-id='type-id-40'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-1432'>
-      <parameter type-id='type-id-460'/>
-      <return type-id='type-id-2590'/>
+    <function-type size-in-bits='64' id='type-id-1444'>
+      <parameter type-id='type-id-472'/>
+      <return type-id='type-id-2611'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2106'>
-      <parameter type-id='type-id-2644'/>
-      <return type-id='type-id-2644'/>
+    <function-type size-in-bits='64' id='type-id-46'>
+      <parameter type-id='type-id-2643' is-artificial='yes'/>
+      <return type-id='type-id-2611'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2077'>
-      <parameter type-id='type-id-2640'/>
-      <return type-id='type-id-2640'/>
+    <function-type size-in-bits='64' id='type-id-2119'>
+      <parameter type-id='type-id-2666'/>
+      <return type-id='type-id-2666'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2450'>
-      <parameter type-id='type-id-394'/>
-      <parameter type-id='type-id-1147'/>
-      <parameter type-id='type-id-386'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2090'>
+      <parameter type-id='type-id-2662'/>
+      <return type-id='type-id-2662'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2456'>
-      <parameter type-id='type-id-394'/>
-      <parameter type-id='type-id-1147'/>
-      <parameter type-id='type-id-386'/>
-      <parameter type-id='type-id-360'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2469'>
+      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-1159'/>
+      <parameter type-id='type-id-399'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-2475'>
+      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-1159'/>
+      <parameter type-id='type-id-399'/>
+      <parameter type-id='type-id-373'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-2481'>
+      <parameter type-id='type-id-472'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2462'>
-      <parameter type-id='type-id-460'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2484'>
+      <parameter type-id='type-id-472'/>
+      <parameter type-id='type-id-373'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2465'>
-      <parameter type-id='type-id-460'/>
-      <parameter type-id='type-id-360'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2486'>
+      <parameter type-id='type-id-472'/>
+      <parameter type-id='type-id-407'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2467'>
-      <parameter type-id='type-id-460'/>
-      <parameter type-id='type-id-394'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2489'>
+      <parameter type-id='type-id-472'/>
+      <parameter type-id='type-id-421'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2470'>
-      <parameter type-id='type-id-460'/>
-      <parameter type-id='type-id-408'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-2492'>
+      <parameter type-id='type-id-1147'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-117'>
+      <parameter type-id='type-id-1511' is-artificial='yes'/>
+      <parameter type-id='type-id-399'/>
+      <parameter type-id='type-id-373'/>
+      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-96'/>
+      <parameter type-id='type-id-1159'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2473'>
-      <parameter type-id='type-id-1135'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-1511' is-artificial='yes'/>
+      <parameter type-id='type-id-2610'/>
+      <parameter type-id='type-id-369'/>
+      <parameter type-id='type-id-413'/>
+      <parameter type-id='type-id-2100'/>
+      <parameter type-id='type-id-2114'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-2479'>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-122'>
+      <parameter type-id='type-id-2648' is-artificial='yes'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-2498'>
+      <return type-id='type-id-2697'/>
     </function-type>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_algorithm.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <qualified-type-def type-id='type-id-3446' const='yes' id='type-id-3447'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3447' size-in-bits='64' id='type-id-3448'/>
-    <qualified-type-def type-id='type-id-3449' const='yes' id='type-id-3450'/>
-    <pointer-type-def type-id='type-id-3450' size-in-bits='64' id='type-id-3451'/>
-    <pointer-type-def type-id='type-id-3449' size-in-bits='64' id='type-id-3452'/>
-    <pointer-type-def type-id='type-id-3453' size-in-bits='64' id='type-id-3454'/>
-    <qualified-type-def type-id='type-id-3454' restrict='yes' id='type-id-3455'/>
-    <pointer-type-def type-id='type-id-3456' size-in-bits='64' id='type-id-3457'/>
-    <qualified-type-def type-id='type-id-3457' restrict='yes' id='type-id-3458'/>
-    <qualified-type-def type-id='type-id-3320' const='yes' id='type-id-3459'/>
-    <qualified-type-def type-id='type-id-3327' const='yes' id='type-id-3460'/>
-    <pointer-type-def type-id='type-id-3461' size-in-bits='64' id='type-id-3462'/>
-    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3463'/>
-    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3461'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-3464'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-3465'/>
+    <qualified-type-def type-id='type-id-3472' const='yes' id='type-id-3473'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3473' size-in-bits='64' id='type-id-3474'/>
+    <qualified-type-def type-id='type-id-3475' const='yes' id='type-id-3476'/>
+    <pointer-type-def type-id='type-id-3476' size-in-bits='64' id='type-id-3477'/>
+    <pointer-type-def type-id='type-id-3475' size-in-bits='64' id='type-id-3478'/>
+    <pointer-type-def type-id='type-id-3479' size-in-bits='64' id='type-id-3480'/>
+    <qualified-type-def type-id='type-id-3480' restrict='yes' id='type-id-3481'/>
+    <pointer-type-def type-id='type-id-3482' size-in-bits='64' id='type-id-3483'/>
+    <qualified-type-def type-id='type-id-3483' restrict='yes' id='type-id-3484'/>
+    <qualified-type-def type-id='type-id-3345' const='yes' id='type-id-3485'/>
+    <qualified-type-def type-id='type-id-3352' const='yes' id='type-id-3486'/>
+    <pointer-type-def type-id='type-id-3487' size-in-bits='64' id='type-id-3488'/>
+    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3489'/>
+    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3487'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-3490'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-3491'/>
     <namespace-decl name='std'>
-      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3466'/>
-      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3467'/>
-      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3468'/>
-      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3469'/>
-      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3470'/>
-      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3471'/>
-      <class-decl name='vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3472'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3473'/>
+      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3492'/>
+      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3493'/>
+      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3494'/>
+      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3495'/>
+      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3496'/>
+      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3497'/>
+      <class-decl name='vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3498'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3499'/>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3474'/>
+          <typedef-decl name='const_reference' type-id='type-id-3501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3500'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3476'/>
+          <typedef-decl name='pointer' type-id='type-id-3503' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3502'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3478'/>
+          <typedef-decl name='reference' type-id='type-id-3505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3504'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3481' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3480'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3506'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3483' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3482'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3509' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3508'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3485' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3484'/>
+          <typedef-decl name='iterator' type-id='type-id-3511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3510'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3486'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3513' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3512'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3490'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3516'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3491'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3492'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3518'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3491'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3517'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3492'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3518'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3493'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3519'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4sizeEv'>
-            <parameter type-id='type-id-3494' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3520' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-3478'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-3504'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='string' type-id='type-id-3466' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-3327'/>
+      <typedef-decl name='string' type-id='type-id-3492' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-3352'/>
       <namespace-decl name='chrono'>
       </namespace-decl>
     </namespace-decl>
-    <typedef-decl name='FILE' type-id='type-id-3463' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-3453'/>
-    <typedef-decl name='__FILE' type-id='type-id-3463' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-3456'/>
+    <typedef-decl name='FILE' type-id='type-id-3489' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-3479'/>
+    <typedef-decl name='__FILE' type-id='type-id-3489' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-3482'/>
     <namespace-decl name='mongo'>
-      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3495'/>
-      <typedef-decl name='BSONElementSet' type-id='type-id-3469' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-3496'/>
-      <typedef-decl name='BSONElementMSet' type-id='type-id-3468' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-3497'/>
+      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3521'/>
+      <typedef-decl name='BSONElementSet' type-id='type-id-3495' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-3522'/>
+      <typedef-decl name='BSONElementMSet' type-id='type-id-3494' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-3523'/>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3449'>
+        <class-decl name='ScatterGatherAlgorithm' size-in-bits='64' visibility='default' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='55' column='1' id='type-id-3475'>
           <member-function access='public' vtable-offset='0'>
             <function-decl name='getRequests' mangled-name='_ZNK5mongo4repl22ScatterGatherAlgorithm11getRequestsEv' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3451' is-artificial='yes'/>
-              <return type-id='type-id-3472'/>
+              <parameter type-id='type-id-3477' is-artificial='yes'/>
+              <return type-id='type-id-3498'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes' vtable-offset='0'>
             <function-decl name='~ScatterGatherAlgorithm' mangled-name='_ZN5mongo4repl22ScatterGatherAlgorithmD0Ev' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl22ScatterGatherAlgorithmD2Ev'>
-              <parameter type-id='type-id-3452' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3478' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='1'>
             <function-decl name='processResponse' mangled-name='_ZN5mongo4repl22ScatterGatherAlgorithm15processResponseERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEE' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3452' is-artificial='yes'/>
-              <parameter type-id='type-id-386'/>
-              <parameter type-id='type-id-3448'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3478' is-artificial='yes'/>
+              <parameter type-id='type-id-399'/>
+              <parameter type-id='type-id-3474'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='hasReceivedSufficientResponses' mangled-name='_ZNK5mongo4repl22ScatterGatherAlgorithm30hasReceivedSufficientResponsesEv' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3451' is-artificial='yes'/>
+              <parameter type-id='type-id-3477' is-artificial='yes'/>
               <return type-id='type-id-1'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='ResponseStatus' type-id='type-id-3498' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3446'/>
+        <typedef-decl name='ResponseStatus' type-id='type-id-3524' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3472'/>
       </namespace-decl>
       <namespace-decl name='executor'>
-        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-3499'>
+        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-3525'>
           <member-type access='private'>
-            <typedef-decl name='ResponseStatus' type-id='type-id-358' filepath='src/mongo/executor/task_executor.h' line='81' column='1' id='type-id-3498'/>
+            <typedef-decl name='ResponseStatus' type-id='type-id-371' filepath='src/mongo/executor/task_executor.h' line='81' column='1' id='type-id-3524'/>
           </member-type>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/mongo/db/repl/scatter_gather_runner.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
-    <reference-type-def kind='lvalue' type-id='type-id-3500' size-in-bits='64' id='type-id-3501'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3502' size-in-bits='64' id='type-id-3503'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3504' size-in-bits='64' id='type-id-3505'/>
-    <pointer-type-def type-id='type-id-3504' size-in-bits='64' id='type-id-3506'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3507' size-in-bits='64' id='type-id-3508'/>
-    <pointer-type-def type-id='type-id-3507' size-in-bits='64' id='type-id-3509'/>
-    <pointer-type-def type-id='type-id-3510' size-in-bits='64' id='type-id-3511'/>
-    <pointer-type-def type-id='type-id-3512' size-in-bits='64' id='type-id-3513'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3514' size-in-bits='64' id='type-id-3515'/>
-    <qualified-type-def type-id='type-id-3500' const='yes' id='type-id-3516'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3516' size-in-bits='64' id='type-id-3517'/>
-    <qualified-type-def type-id='type-id-3502' const='yes' id='type-id-3518'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3518' size-in-bits='64' id='type-id-3519'/>
-    <qualified-type-def type-id='type-id-3504' const='yes' id='type-id-3520'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3520' size-in-bits='64' id='type-id-3521'/>
-    <pointer-type-def type-id='type-id-3520' size-in-bits='64' id='type-id-3522'/>
-    <qualified-type-def type-id='type-id-3507' const='yes' id='type-id-3523'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3523' size-in-bits='64' id='type-id-3524'/>
-    <pointer-type-def type-id='type-id-3523' size-in-bits='64' id='type-id-3525'/>
-    <qualified-type-def type-id='type-id-3510' const='yes' id='type-id-3526'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3526' size-in-bits='64' id='type-id-3527'/>
-    <pointer-type-def type-id='type-id-3526' size-in-bits='64' id='type-id-3528'/>
-    <qualified-type-def type-id='type-id-3512' const='yes' id='type-id-3529'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3529' size-in-bits='64' id='type-id-3530'/>
-    <pointer-type-def type-id='type-id-3529' size-in-bits='64' id='type-id-3531'/>
-    <qualified-type-def type-id='type-id-3532' const='yes' id='type-id-3533'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-3526' containing-type-id='type-id-118' id ='type-id-3527'/>
+    <pointer-to-member-type size-in-bits='64' member-type-id='type-id-3528' containing-type-id='type-id-3529' id ='type-id-3530'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3531' size-in-bits='64' id='type-id-3532'/>
     <reference-type-def kind='lvalue' type-id='type-id-3533' size-in-bits='64' id='type-id-3534'/>
-    <pointer-type-def type-id='type-id-3533' size-in-bits='64' id='type-id-3535'/>
-    <qualified-type-def type-id='type-id-401' const='yes' id='type-id-3536'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3536' size-in-bits='64' id='type-id-3537'/>
-    <qualified-type-def type-id='type-id-3538' const='yes' id='type-id-3539'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3539' size-in-bits='64' id='type-id-3540'/>
-    <qualified-type-def type-id='type-id-3541' const='yes' id='type-id-3542'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3542' size-in-bits='64' id='type-id-3543'/>
-    <qualified-type-def type-id='type-id-2860' const='yes' id='type-id-3544'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3544' size-in-bits='64' id='type-id-2757'/>
-    <qualified-type-def type-id='type-id-2857' const='yes' id='type-id-3545'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3545' size-in-bits='64' id='type-id-2761'/>
-    <qualified-type-def type-id='type-id-3546' const='yes' id='type-id-3547'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3535' size-in-bits='64' id='type-id-3536'/>
+    <pointer-type-def type-id='type-id-3535' size-in-bits='64' id='type-id-3537'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3538' size-in-bits='64' id='type-id-3539'/>
+    <pointer-type-def type-id='type-id-3538' size-in-bits='64' id='type-id-3540'/>
+    <pointer-type-def type-id='type-id-3541' size-in-bits='64' id='type-id-3542'/>
+    <pointer-type-def type-id='type-id-3543' size-in-bits='64' id='type-id-3544'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3545' size-in-bits='64' id='type-id-3546'/>
+    <qualified-type-def type-id='type-id-3531' const='yes' id='type-id-3547'/>
     <reference-type-def kind='lvalue' type-id='type-id-3547' size-in-bits='64' id='type-id-3548'/>
-    <qualified-type-def type-id='type-id-3549' const='yes' id='type-id-3550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3550' size-in-bits='64' id='type-id-3551'/>
-    <qualified-type-def type-id='type-id-3552' const='yes' id='type-id-3553'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3553' size-in-bits='64' id='type-id-3554'/>
-    <qualified-type-def type-id='type-id-3555' const='yes' id='type-id-3556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3556' size-in-bits='64' id='type-id-3557'/>
-    <qualified-type-def type-id='type-id-3558' const='yes' id='type-id-3559'/>
-    <pointer-type-def type-id='type-id-3559' size-in-bits='64' id='type-id-3560'/>
-    <qualified-type-def type-id='type-id-3561' const='yes' id='type-id-3562'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3562' size-in-bits='64' id='type-id-3563'/>
-    <qualified-type-def type-id='type-id-3564' const='yes' id='type-id-3565'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3565' size-in-bits='64' id='type-id-3566'/>
-    <qualified-type-def type-id='type-id-3567' const='yes' id='type-id-3568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3568' size-in-bits='64' id='type-id-3569'/>
-    <qualified-type-def type-id='type-id-3570' const='yes' id='type-id-3571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3571' size-in-bits='64' id='type-id-3572'/>
-    <qualified-type-def type-id='type-id-3573' const='yes' id='type-id-3574'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3574' size-in-bits='64' id='type-id-3575'/>
+    <qualified-type-def type-id='type-id-3533' const='yes' id='type-id-3549'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3549' size-in-bits='64' id='type-id-3550'/>
+    <qualified-type-def type-id='type-id-3535' const='yes' id='type-id-3551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3551' size-in-bits='64' id='type-id-3552'/>
+    <pointer-type-def type-id='type-id-3551' size-in-bits='64' id='type-id-3553'/>
+    <qualified-type-def type-id='type-id-3538' const='yes' id='type-id-3554'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3554' size-in-bits='64' id='type-id-3555'/>
+    <pointer-type-def type-id='type-id-3554' size-in-bits='64' id='type-id-3556'/>
+    <qualified-type-def type-id='type-id-3541' const='yes' id='type-id-3557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3557' size-in-bits='64' id='type-id-3558'/>
+    <pointer-type-def type-id='type-id-3557' size-in-bits='64' id='type-id-3559'/>
+    <qualified-type-def type-id='type-id-3543' const='yes' id='type-id-3560'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3560' size-in-bits='64' id='type-id-3561'/>
+    <pointer-type-def type-id='type-id-3560' size-in-bits='64' id='type-id-3562'/>
+    <qualified-type-def type-id='type-id-3563' const='yes' id='type-id-3564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3564' size-in-bits='64' id='type-id-3565'/>
+    <pointer-type-def type-id='type-id-3564' size-in-bits='64' id='type-id-3566'/>
+    <qualified-type-def type-id='type-id-414' const='yes' id='type-id-3567'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3567' size-in-bits='64' id='type-id-3568'/>
+    <qualified-type-def type-id='type-id-3529' const='yes' id='type-id-3569'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3569' size-in-bits='64' id='type-id-3570'/>
+    <qualified-type-def type-id='type-id-3571' const='yes' id='type-id-3572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3572' size-in-bits='64' id='type-id-3573'/>
+    <qualified-type-def type-id='type-id-2885' const='yes' id='type-id-3574'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3574' size-in-bits='64' id='type-id-2779'/>
+    <qualified-type-def type-id='type-id-2882' const='yes' id='type-id-3575'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3575' size-in-bits='64' id='type-id-2783'/>
     <qualified-type-def type-id='type-id-3576' const='yes' id='type-id-3577'/>
     <reference-type-def kind='lvalue' type-id='type-id-3577' size-in-bits='64' id='type-id-3578'/>
     <qualified-type-def type-id='type-id-3579' const='yes' id='type-id-3580'/>
@@ -25640,2984 +25720,3039 @@
     <qualified-type-def type-id='type-id-3585' const='yes' id='type-id-3586'/>
     <reference-type-def kind='lvalue' type-id='type-id-3586' size-in-bits='64' id='type-id-3587'/>
     <qualified-type-def type-id='type-id-3588' const='yes' id='type-id-3589'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3589' size-in-bits='64' id='type-id-3590'/>
+    <pointer-type-def type-id='type-id-3589' size-in-bits='64' id='type-id-3590'/>
     <qualified-type-def type-id='type-id-3591' const='yes' id='type-id-3592'/>
     <reference-type-def kind='lvalue' type-id='type-id-3592' size-in-bits='64' id='type-id-3593'/>
     <qualified-type-def type-id='type-id-3594' const='yes' id='type-id-3595'/>
     <reference-type-def kind='lvalue' type-id='type-id-3595' size-in-bits='64' id='type-id-3596'/>
     <qualified-type-def type-id='type-id-3597' const='yes' id='type-id-3598'/>
     <reference-type-def kind='lvalue' type-id='type-id-3598' size-in-bits='64' id='type-id-3599'/>
-    <qualified-type-def type-id='type-id-3473' const='yes' id='type-id-3600'/>
-    <pointer-type-def type-id='type-id-3600' size-in-bits='64' id='type-id-3601'/>
-    <qualified-type-def type-id='type-id-3602' const='yes' id='type-id-3603'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3603' size-in-bits='64' id='type-id-3604'/>
-    <qualified-type-def type-id='type-id-3605' const='yes' id='type-id-3606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3606' size-in-bits='64' id='type-id-3489'/>
-    <qualified-type-def type-id='type-id-3607' const='yes' id='type-id-3608'/>
-    <pointer-type-def type-id='type-id-3608' size-in-bits='64' id='type-id-3609'/>
-    <qualified-type-def type-id='type-id-3610' const='yes' id='type-id-3611'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3611' size-in-bits='64' id='type-id-3612'/>
-    <qualified-type-def type-id='type-id-3613' const='yes' id='type-id-3614'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3614' size-in-bits='64' id='type-id-3615'/>
-    <qualified-type-def type-id='type-id-3616' const='yes' id='type-id-3617'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3617' size-in-bits='64' id='type-id-3618'/>
-    <qualified-type-def type-id='type-id-3619' const='yes' id='type-id-3620'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3620' size-in-bits='64' id='type-id-3621'/>
-    <qualified-type-def type-id='type-id-3493' const='yes' id='type-id-3622'/>
-    <pointer-type-def type-id='type-id-3622' size-in-bits='64' id='type-id-3623'/>
+    <qualified-type-def type-id='type-id-3600' const='yes' id='type-id-3601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3601' size-in-bits='64' id='type-id-3602'/>
+    <qualified-type-def type-id='type-id-3603' const='yes' id='type-id-3604'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3604' size-in-bits='64' id='type-id-3605'/>
+    <qualified-type-def type-id='type-id-3606' const='yes' id='type-id-3607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3607' size-in-bits='64' id='type-id-3608'/>
+    <qualified-type-def type-id='type-id-3609' const='yes' id='type-id-3610'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3611'/>
+    <qualified-type-def type-id='type-id-3612' const='yes' id='type-id-3613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3613' size-in-bits='64' id='type-id-3614'/>
+    <qualified-type-def type-id='type-id-3615' const='yes' id='type-id-3616'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3617'/>
+    <qualified-type-def type-id='type-id-3618' const='yes' id='type-id-3619'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-3620'/>
+    <qualified-type-def type-id='type-id-3621' const='yes' id='type-id-3622'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3622' size-in-bits='64' id='type-id-3623'/>
     <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3625'/>
     <reference-type-def kind='lvalue' type-id='type-id-3625' size-in-bits='64' id='type-id-3626'/>
-    <pointer-type-def type-id='type-id-3625' size-in-bits='64' id='type-id-3627'/>
-    <qualified-type-def type-id='type-id-3628' const='yes' id='type-id-3629'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-3630'/>
-    <qualified-type-def type-id='type-id-3631' const='yes' id='type-id-3632'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3633'/>
-    <qualified-type-def type-id='type-id-3634' const='yes' id='type-id-3635'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3635' size-in-bits='64' id='type-id-3636'/>
+    <qualified-type-def type-id='type-id-3627' const='yes' id='type-id-3628'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3628' size-in-bits='64' id='type-id-3629'/>
+    <qualified-type-def type-id='type-id-3499' const='yes' id='type-id-3630'/>
+    <pointer-type-def type-id='type-id-3630' size-in-bits='64' id='type-id-3631'/>
+    <qualified-type-def type-id='type-id-3632' const='yes' id='type-id-3633'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3633' size-in-bits='64' id='type-id-3634'/>
+    <qualified-type-def type-id='type-id-3635' const='yes' id='type-id-3636'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3636' size-in-bits='64' id='type-id-3515'/>
     <qualified-type-def type-id='type-id-3637' const='yes' id='type-id-3638'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3638' size-in-bits='64' id='type-id-3639'/>
+    <pointer-type-def type-id='type-id-3638' size-in-bits='64' id='type-id-3639'/>
     <qualified-type-def type-id='type-id-3640' const='yes' id='type-id-3641'/>
     <reference-type-def kind='lvalue' type-id='type-id-3641' size-in-bits='64' id='type-id-3642'/>
-    <qualified-type-def type-id='type-id-3472' const='yes' id='type-id-3643'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3643' size-in-bits='64' id='type-id-3491'/>
-    <pointer-type-def type-id='type-id-3643' size-in-bits='64' id='type-id-3494'/>
-    <qualified-type-def type-id='type-id-3644' const='yes' id='type-id-3645'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3645' size-in-bits='64' id='type-id-3490'/>
+    <qualified-type-def type-id='type-id-3643' const='yes' id='type-id-3644'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3645'/>
     <qualified-type-def type-id='type-id-3646' const='yes' id='type-id-3647'/>
     <reference-type-def kind='lvalue' type-id='type-id-3647' size-in-bits='64' id='type-id-3648'/>
-    <pointer-type-def type-id='type-id-3647' size-in-bits='64' id='type-id-3649'/>
-    <qualified-type-def type-id='type-id-3650' const='yes' id='type-id-3651'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3651' size-in-bits='64' id='type-id-3652'/>
-    <qualified-type-def type-id='type-id-3653' const='yes' id='type-id-3654'/>
-    <pointer-type-def type-id='type-id-3654' size-in-bits='64' id='type-id-3655'/>
-    <qualified-type-def type-id='type-id-3656' const='yes' id='type-id-3657'/>
-    <pointer-type-def type-id='type-id-3657' size-in-bits='64' id='type-id-3658'/>
+    <qualified-type-def type-id='type-id-3649' const='yes' id='type-id-3650'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3651'/>
+    <qualified-type-def type-id='type-id-3519' const='yes' id='type-id-3652'/>
+    <pointer-type-def type-id='type-id-3652' size-in-bits='64' id='type-id-3653'/>
+    <qualified-type-def type-id='type-id-3654' const='yes' id='type-id-3655'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3656'/>
+    <pointer-type-def type-id='type-id-3655' size-in-bits='64' id='type-id-3657'/>
+    <qualified-type-def type-id='type-id-3658' const='yes' id='type-id-3659'/>
     <reference-type-def kind='lvalue' type-id='type-id-3659' size-in-bits='64' id='type-id-3660'/>
-    <pointer-type-def type-id='type-id-3659' size-in-bits='64' id='type-id-3661'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3532' size-in-bits='64' id='type-id-3662'/>
-    <pointer-type-def type-id='type-id-3532' size-in-bits='64' id='type-id-3663'/>
-    <qualified-type-def type-id='type-id-1451' const='yes' id='type-id-3664'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3664' size-in-bits='64' id='type-id-3665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-3666'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1451' size-in-bits='64' id='type-id-3667'/>
-    <qualified-type-def type-id='type-id-1473' const='yes' id='type-id-3668'/>
+    <qualified-type-def type-id='type-id-3661' const='yes' id='type-id-3662'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3663'/>
+    <qualified-type-def type-id='type-id-3664' const='yes' id='type-id-3665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3665' size-in-bits='64' id='type-id-3666'/>
+    <qualified-type-def type-id='type-id-3667' const='yes' id='type-id-3668'/>
     <reference-type-def kind='lvalue' type-id='type-id-3668' size-in-bits='64' id='type-id-3669'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3538' size-in-bits='64' id='type-id-3670'/>
-    <pointer-type-def type-id='type-id-3538' size-in-bits='64' id='type-id-3671'/>
-    <qualified-type-def type-id='type-id-3671' const='yes' id='type-id-3672'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3672' size-in-bits='64' id='type-id-3673'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3671' size-in-bits='64' id='type-id-3674'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3671' size-in-bits='64' id='type-id-3675'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3541' size-in-bits='64' id='type-id-3676'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3541' size-in-bits='64' id='type-id-3677'/>
-    <pointer-type-def type-id='type-id-3541' size-in-bits='64' id='type-id-3678'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2860' size-in-bits='64' id='type-id-3679'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2860' size-in-bits='64' id='type-id-2758'/>
-    <pointer-type-def type-id='type-id-2860' size-in-bits='64' id='type-id-2759'/>
-    <qualified-type-def type-id='type-id-2759' const='yes' id='type-id-3680'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3680' size-in-bits='64' id='type-id-3291'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2759' size-in-bits='64' id='type-id-3290'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2857' size-in-bits='64' id='type-id-3681'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2857' size-in-bits='64' id='type-id-2762'/>
-    <pointer-type-def type-id='type-id-2857' size-in-bits='64' id='type-id-2763'/>
-    <qualified-type-def type-id='type-id-2763' const='yes' id='type-id-3682'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3682' size-in-bits='64' id='type-id-3293'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2763' size-in-bits='64' id='type-id-3292'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3546' size-in-bits='64' id='type-id-3683'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3546' size-in-bits='64' id='type-id-3684'/>
-    <pointer-type-def type-id='type-id-3546' size-in-bits='64' id='type-id-3685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3549' size-in-bits='64' id='type-id-3686'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3549' size-in-bits='64' id='type-id-3687'/>
-    <pointer-type-def type-id='type-id-3549' size-in-bits='64' id='type-id-3688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3552' size-in-bits='64' id='type-id-3689'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3552' size-in-bits='64' id='type-id-3690'/>
-    <pointer-type-def type-id='type-id-3552' size-in-bits='64' id='type-id-3691'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3555' size-in-bits='64' id='type-id-3692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3555' size-in-bits='64' id='type-id-3693'/>
-    <pointer-type-def type-id='type-id-3555' size-in-bits='64' id='type-id-3694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3558' size-in-bits='64' id='type-id-3695'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3558' size-in-bits='64' id='type-id-3696'/>
-    <pointer-type-def type-id='type-id-3558' size-in-bits='64' id='type-id-3697'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3561' size-in-bits='64' id='type-id-3698'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3561' size-in-bits='64' id='type-id-3699'/>
-    <pointer-type-def type-id='type-id-3561' size-in-bits='64' id='type-id-3700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3564' size-in-bits='64' id='type-id-3701'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3564' size-in-bits='64' id='type-id-3702'/>
-    <pointer-type-def type-id='type-id-3564' size-in-bits='64' id='type-id-3703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3567' size-in-bits='64' id='type-id-3704'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3567' size-in-bits='64' id='type-id-3705'/>
-    <pointer-type-def type-id='type-id-3567' size-in-bits='64' id='type-id-3706'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3570' size-in-bits='64' id='type-id-3707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3573' size-in-bits='64' id='type-id-3708'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3573' size-in-bits='64' id='type-id-3709'/>
-    <pointer-type-def type-id='type-id-3573' size-in-bits='64' id='type-id-3710'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3576' size-in-bits='64' id='type-id-3711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3579' size-in-bits='64' id='type-id-3712'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3579' size-in-bits='64' id='type-id-3713'/>
-    <pointer-type-def type-id='type-id-3579' size-in-bits='64' id='type-id-3714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3582' size-in-bits='64' id='type-id-3715'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3585' size-in-bits='64' id='type-id-3716'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3585' size-in-bits='64' id='type-id-3717'/>
-    <pointer-type-def type-id='type-id-3585' size-in-bits='64' id='type-id-3718'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3588' size-in-bits='64' id='type-id-3719'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-3720'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-3721'/>
-    <pointer-type-def type-id='type-id-3591' size-in-bits='64' id='type-id-3722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-3723'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-3724'/>
-    <pointer-type-def type-id='type-id-3594' size-in-bits='64' id='type-id-3725'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3597' size-in-bits='64' id='type-id-3726'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3597' size-in-bits='64' id='type-id-3727'/>
-    <pointer-type-def type-id='type-id-3597' size-in-bits='64' id='type-id-3728'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3473' size-in-bits='64' id='type-id-3729'/>
-    <pointer-type-def type-id='type-id-3473' size-in-bits='64' id='type-id-3730'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3602' size-in-bits='64' id='type-id-3731'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3602' size-in-bits='64' id='type-id-3732'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3733' size-in-bits='64' id='type-id-3734'/>
-    <pointer-type-def type-id='type-id-3733' size-in-bits='64' id='type-id-3735'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3607' size-in-bits='64' id='type-id-3736'/>
-    <pointer-type-def type-id='type-id-3607' size-in-bits='64' id='type-id-3737'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3738'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-3739'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3740' size-in-bits='64' id='type-id-3741'/>
-    <pointer-type-def type-id='type-id-3740' size-in-bits='64' id='type-id-3742'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3743' size-in-bits='64' id='type-id-3744'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3745' size-in-bits='64' id='type-id-3746'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3616' size-in-bits='64' id='type-id-3747'/>
-    <pointer-type-def type-id='type-id-3616' size-in-bits='64' id='type-id-3748'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-3749'/>
-    <pointer-type-def type-id='type-id-3619' size-in-bits='64' id='type-id-3750'/>
-    <pointer-type-def type-id='type-id-3751' size-in-bits='64' id='type-id-3752'/>
-    <pointer-type-def type-id='type-id-3753' size-in-bits='64' id='type-id-3754'/>
-    <pointer-type-def type-id='type-id-3493' size-in-bits='64' id='type-id-3755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3756'/>
-    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3757'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3753' size-in-bits='64' id='type-id-3758'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3759' size-in-bits='64' id='type-id-3760'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3761' size-in-bits='64' id='type-id-3762'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3763' size-in-bits='64' id='type-id-3764'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3765' size-in-bits='64' id='type-id-3766'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3767' size-in-bits='64' id='type-id-3768'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3769' size-in-bits='64' id='type-id-3770'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3771' size-in-bits='64' id='type-id-3772'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3773' size-in-bits='64' id='type-id-3774'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3776'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3777' size-in-bits='64' id='type-id-3778'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3779' size-in-bits='64' id='type-id-3780'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3781' size-in-bits='64' id='type-id-3782'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3783' size-in-bits='64' id='type-id-3784'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3785' size-in-bits='64' id='type-id-3786'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3787' size-in-bits='64' id='type-id-3788'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3789' size-in-bits='64' id='type-id-3790'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3789' size-in-bits='64' id='type-id-3791'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3628' size-in-bits='64' id='type-id-2818'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3628' size-in-bits='64' id='type-id-3792'/>
-    <pointer-type-def type-id='type-id-3628' size-in-bits='64' id='type-id-3793'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3631' size-in-bits='64' id='type-id-2802'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3631' size-in-bits='64' id='type-id-3794'/>
-    <pointer-type-def type-id='type-id-3631' size-in-bits='64' id='type-id-3795'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3796'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3634' size-in-bits='64' id='type-id-3797'/>
-    <pointer-type-def type-id='type-id-3634' size-in-bits='64' id='type-id-3798'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3637' size-in-bits='64' id='type-id-3799'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3637' size-in-bits='64' id='type-id-3800'/>
-    <pointer-type-def type-id='type-id-3637' size-in-bits='64' id='type-id-3801'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3802'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3803'/>
-    <pointer-type-def type-id='type-id-3640' size-in-bits='64' id='type-id-3804'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3472' size-in-bits='64' id='type-id-3805'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3472' size-in-bits='64' id='type-id-3492'/>
-    <pointer-type-def type-id='type-id-3472' size-in-bits='64' id='type-id-3488'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3806'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3807'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3808'/>
-    <pointer-type-def type-id='type-id-3646' size-in-bits='64' id='type-id-3809'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3650' size-in-bits='64' id='type-id-3810'/>
-    <pointer-type-def type-id='type-id-3811' size-in-bits='64' id='type-id-3812'/>
-    <qualified-type-def type-id='type-id-3812' const='yes' id='type-id-3813'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3814'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3812' size-in-bits='64' id='type-id-3815'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3812' size-in-bits='64' id='type-id-3816'/>
-    <pointer-type-def type-id='type-id-3817' size-in-bits='64' id='type-id-3818'/>
-    <qualified-type-def type-id='type-id-3818' const='yes' id='type-id-3819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3820'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3821'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3822'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3811' size-in-bits='64' id='type-id-3823'/>
-    <qualified-type-def type-id='type-id-3824' volatile='yes' id='type-id-3653'/>
-    <qualified-type-def type-id='type-id-3825' volatile='yes' id='type-id-3656'/>
-    <pointer-type-def type-id='type-id-3826' size-in-bits='64' id='type-id-3827'/>
-    <qualified-type-def type-id='type-id-3827' restrict='yes' id='type-id-3828'/>
-    <pointer-type-def type-id='type-id-3829' size-in-bits='64' id='type-id-3830'/>
-    <qualified-type-def type-id='type-id-3830' restrict='yes' id='type-id-3831'/>
-    <qualified-type-def type-id='type-id-3321' const='yes' id='type-id-3832'/>
-    <qualified-type-def type-id='type-id-3833' const='yes' id='type-id-3834'/>
-    <qualified-type-def type-id='type-id-3835' const='yes' id='type-id-3836'/>
-    <qualified-type-def type-id='type-id-3328' const='yes' id='type-id-3837'/>
-    <qualified-type-def type-id='type-id-3838' const='yes' id='type-id-3839'/>
-    <pointer-type-def type-id='type-id-3839' size-in-bits='64' id='type-id-3840'/>
-    <qualified-type-def type-id='type-id-3841' const='yes' id='type-id-3842'/>
-    <qualified-type-def type-id='type-id-3843' const='yes' id='type-id-3844'/>
-    <pointer-type-def type-id='type-id-3845' size-in-bits='64' id='type-id-3846'/>
-    <pointer-type-def type-id='type-id-3847' size-in-bits='64' id='type-id-3354'/>
-    <pointer-type-def type-id='type-id-3848' size-in-bits='64' id='type-id-3353'/>
+    <qualified-type-def type-id='type-id-3670' const='yes' id='type-id-3671'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3671' size-in-bits='64' id='type-id-3672'/>
+    <qualified-type-def type-id='type-id-3498' const='yes' id='type-id-3673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3673' size-in-bits='64' id='type-id-3517'/>
+    <pointer-type-def type-id='type-id-3673' size-in-bits='64' id='type-id-3520'/>
+    <qualified-type-def type-id='type-id-3674' const='yes' id='type-id-3675'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3516'/>
+    <qualified-type-def type-id='type-id-3676' const='yes' id='type-id-3677'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3677' size-in-bits='64' id='type-id-3678'/>
+    <pointer-type-def type-id='type-id-3677' size-in-bits='64' id='type-id-3679'/>
+    <qualified-type-def type-id='type-id-3680' const='yes' id='type-id-3681'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3681' size-in-bits='64' id='type-id-3682'/>
+    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3684'/>
+    <pointer-type-def type-id='type-id-3684' size-in-bits='64' id='type-id-3685'/>
+    <qualified-type-def type-id='type-id-3686' const='yes' id='type-id-3687'/>
+    <pointer-type-def type-id='type-id-3687' size-in-bits='64' id='type-id-3688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3689' size-in-bits='64' id='type-id-3690'/>
+    <pointer-type-def type-id='type-id-3689' size-in-bits='64' id='type-id-3691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3563' size-in-bits='64' id='type-id-3692'/>
+    <pointer-type-def type-id='type-id-3563' size-in-bits='64' id='type-id-3693'/>
+    <qualified-type-def type-id='type-id-1464' const='yes' id='type-id-3694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1464' size-in-bits='64' id='type-id-3696'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1464' size-in-bits='64' id='type-id-3697'/>
+    <qualified-type-def type-id='type-id-1486' const='yes' id='type-id-3698'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3529' size-in-bits='64' id='type-id-3700'/>
+    <pointer-type-def type-id='type-id-3529' size-in-bits='64' id='type-id-3701'/>
+    <qualified-type-def type-id='type-id-3701' const='yes' id='type-id-3702'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3702' size-in-bits='64' id='type-id-3703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3701' size-in-bits='64' id='type-id-3704'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3701' size-in-bits='64' id='type-id-3705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3571' size-in-bits='64' id='type-id-3706'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3571' size-in-bits='64' id='type-id-3707'/>
+    <pointer-type-def type-id='type-id-3571' size-in-bits='64' id='type-id-3708'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2885' size-in-bits='64' id='type-id-3709'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2885' size-in-bits='64' id='type-id-2780'/>
+    <pointer-type-def type-id='type-id-2885' size-in-bits='64' id='type-id-2781'/>
+    <qualified-type-def type-id='type-id-2781' const='yes' id='type-id-3710'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3710' size-in-bits='64' id='type-id-3316'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2781' size-in-bits='64' id='type-id-3315'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2882' size-in-bits='64' id='type-id-3711'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2882' size-in-bits='64' id='type-id-2784'/>
+    <pointer-type-def type-id='type-id-2882' size-in-bits='64' id='type-id-2785'/>
+    <qualified-type-def type-id='type-id-2785' const='yes' id='type-id-3712'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3712' size-in-bits='64' id='type-id-3318'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2785' size-in-bits='64' id='type-id-3317'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3576' size-in-bits='64' id='type-id-3713'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3576' size-in-bits='64' id='type-id-3714'/>
+    <pointer-type-def type-id='type-id-3576' size-in-bits='64' id='type-id-3715'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3579' size-in-bits='64' id='type-id-3716'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3579' size-in-bits='64' id='type-id-3717'/>
+    <pointer-type-def type-id='type-id-3579' size-in-bits='64' id='type-id-3718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3582' size-in-bits='64' id='type-id-3719'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3582' size-in-bits='64' id='type-id-3720'/>
+    <pointer-type-def type-id='type-id-3582' size-in-bits='64' id='type-id-3721'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3585' size-in-bits='64' id='type-id-3722'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3585' size-in-bits='64' id='type-id-3723'/>
+    <pointer-type-def type-id='type-id-3585' size-in-bits='64' id='type-id-3724'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3588' size-in-bits='64' id='type-id-3725'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3588' size-in-bits='64' id='type-id-3726'/>
+    <pointer-type-def type-id='type-id-3588' size-in-bits='64' id='type-id-3727'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-3728'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-3729'/>
+    <pointer-type-def type-id='type-id-3591' size-in-bits='64' id='type-id-3730'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-3731'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-3732'/>
+    <pointer-type-def type-id='type-id-3594' size-in-bits='64' id='type-id-3733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3597' size-in-bits='64' id='type-id-3734'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3597' size-in-bits='64' id='type-id-3735'/>
+    <pointer-type-def type-id='type-id-3597' size-in-bits='64' id='type-id-3736'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3600' size-in-bits='64' id='type-id-3737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3603' size-in-bits='64' id='type-id-3738'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3603' size-in-bits='64' id='type-id-3739'/>
+    <pointer-type-def type-id='type-id-3603' size-in-bits='64' id='type-id-3740'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3606' size-in-bits='64' id='type-id-3741'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3609' size-in-bits='64' id='type-id-3742'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3609' size-in-bits='64' id='type-id-3743'/>
+    <pointer-type-def type-id='type-id-3609' size-in-bits='64' id='type-id-3744'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3612' size-in-bits='64' id='type-id-3745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3615' size-in-bits='64' id='type-id-3746'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3615' size-in-bits='64' id='type-id-3747'/>
+    <pointer-type-def type-id='type-id-3615' size-in-bits='64' id='type-id-3748'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3618' size-in-bits='64' id='type-id-3749'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3621' size-in-bits='64' id='type-id-3750'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3621' size-in-bits='64' id='type-id-3751'/>
+    <pointer-type-def type-id='type-id-3621' size-in-bits='64' id='type-id-3752'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3753'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3754'/>
+    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3755'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3756'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3757'/>
+    <pointer-type-def type-id='type-id-3627' size-in-bits='64' id='type-id-3758'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3499' size-in-bits='64' id='type-id-3759'/>
+    <pointer-type-def type-id='type-id-3499' size-in-bits='64' id='type-id-3760'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3761'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3762'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3763' size-in-bits='64' id='type-id-3764'/>
+    <pointer-type-def type-id='type-id-3763' size-in-bits='64' id='type-id-3765'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3637' size-in-bits='64' id='type-id-3766'/>
+    <pointer-type-def type-id='type-id-3637' size-in-bits='64' id='type-id-3767'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3768'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3640' size-in-bits='64' id='type-id-3769'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3770' size-in-bits='64' id='type-id-3771'/>
+    <pointer-type-def type-id='type-id-3770' size-in-bits='64' id='type-id-3772'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3773' size-in-bits='64' id='type-id-3774'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3776'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3646' size-in-bits='64' id='type-id-3777'/>
+    <pointer-type-def type-id='type-id-3646' size-in-bits='64' id='type-id-3778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3779'/>
+    <pointer-type-def type-id='type-id-3649' size-in-bits='64' id='type-id-3780'/>
+    <pointer-type-def type-id='type-id-3781' size-in-bits='64' id='type-id-3782'/>
+    <pointer-type-def type-id='type-id-3783' size-in-bits='64' id='type-id-3784'/>
+    <pointer-type-def type-id='type-id-3519' size-in-bits='64' id='type-id-3785'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3654' size-in-bits='64' id='type-id-3786'/>
+    <pointer-type-def type-id='type-id-3654' size-in-bits='64' id='type-id-3787'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3783' size-in-bits='64' id='type-id-3788'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3789' size-in-bits='64' id='type-id-3790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3791' size-in-bits='64' id='type-id-3792'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3793' size-in-bits='64' id='type-id-3794'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3795' size-in-bits='64' id='type-id-3796'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3797' size-in-bits='64' id='type-id-3798'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3799' size-in-bits='64' id='type-id-3800'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3801' size-in-bits='64' id='type-id-3802'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3803' size-in-bits='64' id='type-id-3804'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3805' size-in-bits='64' id='type-id-3806'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3807' size-in-bits='64' id='type-id-3808'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3809' size-in-bits='64' id='type-id-3810'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3811' size-in-bits='64' id='type-id-3812'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3815' size-in-bits='64' id='type-id-3816'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3817' size-in-bits='64' id='type-id-3818'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3820'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3821'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3822' size-in-bits='64' id='type-id-3823'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3658' size-in-bits='64' id='type-id-2843'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3658' size-in-bits='64' id='type-id-3824'/>
+    <pointer-type-def type-id='type-id-3658' size-in-bits='64' id='type-id-3825'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-2827'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3826'/>
+    <pointer-type-def type-id='type-id-3661' size-in-bits='64' id='type-id-3827'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3664' size-in-bits='64' id='type-id-3828'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3664' size-in-bits='64' id='type-id-3829'/>
+    <pointer-type-def type-id='type-id-3664' size-in-bits='64' id='type-id-3830'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3667' size-in-bits='64' id='type-id-3831'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3667' size-in-bits='64' id='type-id-3832'/>
+    <pointer-type-def type-id='type-id-3667' size-in-bits='64' id='type-id-3833'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3670' size-in-bits='64' id='type-id-3834'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3670' size-in-bits='64' id='type-id-3835'/>
+    <pointer-type-def type-id='type-id-3670' size-in-bits='64' id='type-id-3836'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3498' size-in-bits='64' id='type-id-3837'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3498' size-in-bits='64' id='type-id-3518'/>
+    <pointer-type-def type-id='type-id-3498' size-in-bits='64' id='type-id-3514'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3674' size-in-bits='64' id='type-id-3838'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3839'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3676' size-in-bits='64' id='type-id-3840'/>
+    <pointer-type-def type-id='type-id-3676' size-in-bits='64' id='type-id-3841'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3680' size-in-bits='64' id='type-id-3842'/>
+    <pointer-type-def type-id='type-id-3843' size-in-bits='64' id='type-id-3844'/>
+    <qualified-type-def type-id='type-id-3844' const='yes' id='type-id-3845'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3845' size-in-bits='64' id='type-id-3846'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3844' size-in-bits='64' id='type-id-3847'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3844' size-in-bits='64' id='type-id-3848'/>
     <pointer-type-def type-id='type-id-3849' size-in-bits='64' id='type-id-3850'/>
-    <pointer-type-def type-id='type-id-3851' size-in-bits='64' id='type-id-2830'/>
-    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3852'/>
-    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3845'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-3853'/>
-    <qualified-type-def type-id='type-id-52' restrict='yes' id='type-id-3854'/>
+    <qualified-type-def type-id='type-id-3850' const='yes' id='type-id-3851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-3852'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3850' size-in-bits='64' id='type-id-3853'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3850' size-in-bits='64' id='type-id-3854'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3843' size-in-bits='64' id='type-id-3855'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3527' size-in-bits='64' id='type-id-3856'/>
+    <qualified-type-def type-id='type-id-3857' volatile='yes' id='type-id-3683'/>
+    <qualified-type-def type-id='type-id-3858' volatile='yes' id='type-id-3686'/>
+    <pointer-type-def type-id='type-id-3859' size-in-bits='64' id='type-id-3860'/>
+    <qualified-type-def type-id='type-id-3860' restrict='yes' id='type-id-3861'/>
+    <pointer-type-def type-id='type-id-3862' size-in-bits='64' id='type-id-3863'/>
+    <qualified-type-def type-id='type-id-3863' restrict='yes' id='type-id-3864'/>
+    <qualified-type-def type-id='type-id-3346' const='yes' id='type-id-3865'/>
+    <qualified-type-def type-id='type-id-3866' const='yes' id='type-id-3867'/>
+    <qualified-type-def type-id='type-id-3868' const='yes' id='type-id-3869'/>
+    <qualified-type-def type-id='type-id-3353' const='yes' id='type-id-3870'/>
+    <qualified-type-def type-id='type-id-3871' const='yes' id='type-id-3872'/>
+    <pointer-type-def type-id='type-id-3872' size-in-bits='64' id='type-id-3873'/>
+    <qualified-type-def type-id='type-id-3874' const='yes' id='type-id-3875'/>
+    <qualified-type-def type-id='type-id-3876' const='yes' id='type-id-3877'/>
+    <pointer-type-def type-id='type-id-3878' size-in-bits='64' id='type-id-3879'/>
+    <pointer-type-def type-id='type-id-3880' size-in-bits='64' id='type-id-3379'/>
+    <pointer-type-def type-id='type-id-3881' size-in-bits='64' id='type-id-3378'/>
+    <pointer-type-def type-id='type-id-3882' size-in-bits='64' id='type-id-3883'/>
+    <pointer-type-def type-id='type-id-3884' size-in-bits='64' id='type-id-2855'/>
+    <class-decl name='_IO_FILE' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3885'/>
+    <class-decl name='lconv' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3878'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-3886'/>
+    <qualified-type-def type-id='type-id-57' restrict='yes' id='type-id-3887'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3504'>
+      <class-decl name='__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3535'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3856' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3855'/>
+          <typedef-decl name='pointer' type-id='type-id-3889' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3888'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3858' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3857'/>
+          <typedef-decl name='reference' type-id='type-id-3891' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3890'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-401' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-414' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3506' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3537' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS6_'>
-            <parameter type-id='type-id-3506' is-artificial='yes'/>
-            <parameter type-id='type-id-3537'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3537' is-artificial='yes'/>
+            <parameter type-id='type-id-3568'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv'>
-            <parameter type-id='type-id-3522' is-artificial='yes'/>
-            <return type-id='type-id-3537'/>
+            <parameter type-id='type-id-3553' is-artificial='yes'/>
+            <return type-id='type-id-3568'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3507'>
+      <class-decl name='__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='709' column='1' id='type-id-3538'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3859'/>
+          <typedef-decl name='pointer' type-id='type-id-3893' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3892'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3862' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3861'/>
+          <typedef-decl name='reference' type-id='type-id-3895' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='721' column='1' id='type-id-3894'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1473' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1486' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3509' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3540' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS5_'>
-            <parameter type-id='type-id-3509' is-artificial='yes'/>
-            <parameter type-id='type-id-3669'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3540' is-artificial='yes'/>
+            <parameter type-id='type-id-3699'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEdeEv'>
-            <parameter type-id='type-id-3525' is-artificial='yes'/>
-            <return type-id='type-id-3861'/>
+            <parameter type-id='type-id-3556' is-artificial='yes'/>
+            <return type-id='type-id-3894'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEv'>
-            <parameter type-id='type-id-3509' is-artificial='yes'/>
-            <return type-id='type-id-3508'/>
+            <parameter type-id='type-id-3540' is-artificial='yes'/>
+            <return type-id='type-id-3539'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv'>
-            <parameter type-id='type-id-3525' is-artificial='yes'/>
-            <return type-id='type-id-3669'/>
+            <parameter type-id='type-id-3556' is-artificial='yes'/>
+            <return type-id='type-id-3699'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3510'>
+      <class-decl name='new_allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3541'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-387' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3863'/>
+          <typedef-decl name='const_pointer' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3896'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-386' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3864'/>
+          <typedef-decl name='const_reference' type-id='type-id-399' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3897'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-1464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3865'/>
+          <typedef-decl name='pointer' type-id='type-id-1477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='63' column='1' id='type-id-3898'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1462' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3866'/>
+          <typedef-decl name='reference' type-id='type-id-1475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3899'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3511' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3542' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3511' is-artificial='yes'/>
-            <parameter type-id='type-id-3527'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3542' is-artificial='yes'/>
+            <parameter type-id='type-id-3558'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEED2Ev'>
-            <parameter type-id='type-id-3511' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3542' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE10deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE10deallocateEPS3_m'>
-            <parameter type-id='type-id-3511' is-artificial='yes'/>
-            <parameter type-id='type-id-3865'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3542' is-artificial='yes'/>
+            <parameter type-id='type-id-3898'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3512'>
+      <class-decl name='new_allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='58' column='1' id='type-id-3543'>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-401' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3867'/>
+          <typedef-decl name='const_pointer' type-id='type-id-414' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3900'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3868'/>
+          <typedef-decl name='const_reference' type-id='type-id-413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3901'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-3530'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <parameter type-id='type-id-3561'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE10deallocateEPS4_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE10deallocateEPS4_m'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-3860'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <parameter type-id='type-id-3893'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <parameter type-id='type-id-1486'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8allocateEmPKv'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-52'/>
-            <return type-id='type-id-3860'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-57'/>
+            <return type-id='type-id-3893'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8max_sizeEv'>
-            <parameter type-id='type-id-3531' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3562' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_'>
-            <parameter type-id='type-id-3513' is-artificial='yes'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3544' is-artificial='yes'/>
+            <parameter type-id='type-id-1486'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3869'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3870'/>
+      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3902'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3903'/>
         <member-type access='public'>
-          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3871'>
+          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3904'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3873' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3872'/>
+              <typedef-decl name='other' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3905'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3517' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3475'/>
+          <typedef-decl name='const_reference' type-id='type-id-3548' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3501'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3875' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3874'/>
+          <typedef-decl name='pointer' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3907'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3479'/>
+          <typedef-decl name='reference' type-id='type-id-3532' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3505'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3751' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3500'/>
+          <typedef-decl name='value_type' type-id='type-id-3781' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3531'/>
         </member-type>
       </class-decl>
-      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3876'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3877'/>
+      <class-decl name='__alloc_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='95' column='1' id='type-id-3909'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3910'/>
         <member-type access='public'>
-          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3878'>
+          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='168' column='1' id='type-id-3911'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3880' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3879'/>
+              <typedef-decl name='other' type-id='type-id-3913' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='169' column='1' id='type-id-3912'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3519' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3881'/>
+          <typedef-decl name='const_reference' type-id='type-id-3550' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='110' column='1' id='type-id-3914'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3883' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3882'/>
+          <typedef-decl name='pointer' type-id='type-id-3916' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='104' column='1' id='type-id-3915'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3503' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3884'/>
+          <typedef-decl name='reference' type-id='type-id-3534' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='109' column='1' id='type-id-3917'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3753' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3502'/>
+          <typedef-decl name='value_type' type-id='type-id-3783' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='103' column='1' id='type-id-3533'/>
         </member-type>
       </class-decl>
-      <class-decl name='__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3481'/>
-      <class-decl name='__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3485'/>
+      <class-decl name='__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3507'/>
+      <class-decl name='__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3511'/>
       <function-decl name='operator==&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxeqIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxeqIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESF_'>
-        <parameter type-id='type-id-3521' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1'/>
-        <parameter type-id='type-id-3521' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='816' column='1'/>
+        <parameter type-id='type-id-3552' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1'/>
+        <parameter type-id='type-id-3552' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='816' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESE_'>
-        <parameter type-id='type-id-3524' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-3524' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-3555' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-3555' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-3541'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3885'/>
+      <class-decl name='_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-3571'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3918'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3558' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3588' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-3634' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3664' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-3543'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3708' is-artificial='yes'/>
+            <parameter type-id='type-id-3573'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2EOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2EOSG_'>
-            <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-3677'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3708' is-artificial='yes'/>
+            <parameter type-id='type-id-3707'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_'>
-            <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-3696'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3708' is-artificial='yes'/>
+            <parameter type-id='type-id-3726'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_'>
-            <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3708' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, mongo::executor::TaskExecutor::CallbackHandle &amp;, 0, 1&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEE6__callIvJRS6_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEE6__callIvJRS6_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-3678' is-artificial='yes'/>
-            <parameter type-id='type-id-3794'/>
-            <parameter type-id='type-id-2734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3708' is-artificial='yes'/>
+            <parameter type-id='type-id-3826'/>
+            <parameter type-id='type-id-2756'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2860'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3886'/>
+      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2885'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3919'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3818' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3850' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-3640' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3670' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-2757'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2781' is-artificial='yes'/>
+            <parameter type-id='type-id-2779'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2EOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2EOSE_'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-2758'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2781' is-artificial='yes'/>
+            <parameter type-id='type-id-2780'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-3822'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2781' is-artificial='yes'/>
+            <parameter type-id='type-id-3854'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, void&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEclIJS5_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEclIJS5_EvEET0_DpOT_'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2781' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, 0, 1&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EE6__callIvJS5_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EE6__callIvJS5_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
-            <parameter type-id='type-id-3792'/>
-            <parameter type-id='type-id-2734'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2781' is-artificial='yes'/>
+            <parameter type-id='type-id-3824'/>
+            <parameter type-id='type-id-2756'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2857'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3887'/>
+      <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1248' column='1' id='type-id-2882'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3920'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3812' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3844' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-3637' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3667' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-2761'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2785' is-artificial='yes'/>
+            <parameter type-id='type-id-2783'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2EOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2EOSI_'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-2762'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2785' is-artificial='yes'/>
+            <parameter type-id='type-id-2784'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-3816'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2785' is-artificial='yes'/>
+            <parameter type-id='type-id-3848'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;, void&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEclIJS5_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEclIJS5_EvEET0_DpOT_'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2785' is-artificial='yes'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::executor::TaskExecutor::CallbackArgs &amp;, 0, 1, 2&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EE6__callIvJS5_EJLm0ELm1ELm2EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EE6__callIvJS5_EJLm0ELm1ELm2EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
-            <parameter type-id='type-id-2368'/>
-            <parameter type-id='type-id-2743'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-2785' is-artificial='yes'/>
+            <parameter type-id='type-id-2387'/>
+            <parameter type-id='type-id-2765'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-3888'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2760'/>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-3921'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2782'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE9_M_invokeERKSt9_Any_dataS5_'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-394'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-3889'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2756'/>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-3922'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2778'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE9_M_invokeERKSt9_Any_dataS5_'>
-            <parameter type-id='type-id-460'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-472'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-3558'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3890'/>
+      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-3588'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3923'/>
+        <member-type access='private'>
+          <typedef-decl name='_Functor' type-id='type-id-3527' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='512' column='1' id='type-id-3924'/>
+        </member-type>
+        <data-member access='private' layout-offset-in-bits='0'>
+          <var-decl name='__pmf' type-id='type-id-3924' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='588' column='1'/>
+        </data-member>
         <member-function access='public'>
           <function-decl name='_Mem_fn' mangled-name='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEC2ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEC2ES9_'>
-            <parameter type-id='type-id-3697' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3727' is-artificial='yes'/>
+            <parameter type-id='type-id-3924'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_'>
-            <parameter type-id='type-id-3560' is-artificial='yes'/>
-            <parameter type-id='type-id-1498'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3590' is-artificial='yes'/>
+            <parameter type-id='type-id-1511'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-3824'>
+      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-3857'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0ELb0EEclIRS6_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SG_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0ELb0EEclIRS6_St5tupleIJRKNS3_12CallbackArgsEEEEEOT_SG_RT0_'>
-            <parameter type-id='type-id-3655' is-artificial='yes'/>
-            <parameter type-id='type-id-3666'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-3666'/>
+            <parameter type-id='type-id-3685' is-artificial='yes'/>
+            <parameter type-id='type-id-3696'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-3696'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::repl::ScatterGatherRunner *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-3825'>
+      <class-decl name='_Mu&lt;mongo::repl::ScatterGatherRunner *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-3858'>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ScatterGatherRunner *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor25RemoteCommandCallbackArgsEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3674'/>
-            <parameter type-id='type-id-2818'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3688' is-artificial='yes'/>
+            <parameter type-id='type-id-3704'/>
+            <parameter type-id='type-id-2843'/>
+            <return type-id='type-id-3704'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::repl::ScatterGatherRunner *&amp;, std::tuple&lt;const mongo::executor::TaskExecutor::CallbackArgs &amp;&gt; &gt;' mangled-name='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNVKSt3_MuIPN5mongo4repl19ScatterGatherRunnerELb0ELb0EEclIRS3_St5tupleIJRKNS0_8executor12TaskExecutor12CallbackArgsEEEEEOT_SF_RT0_'>
-            <parameter type-id='type-id-3658' is-artificial='yes'/>
-            <parameter type-id='type-id-3674'/>
-            <parameter type-id='type-id-2367'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3688' is-artificial='yes'/>
+            <parameter type-id='type-id-3704'/>
+            <parameter type-id='type-id-2386'/>
+            <return type-id='type-id-3704'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3616'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3510'/>
+      <class-decl name='allocator&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3646'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3541'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3891'>
+          <class-decl name='rebind&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3925'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3616' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3892'/>
+              <typedef-decl name='other' type-id='type-id-3646' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3926'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-384' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3644'/>
+          <typedef-decl name='value_type' type-id='type-id-397' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='101' column='1' id='type-id-3674'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3748' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3778' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3748' is-artificial='yes'/>
-            <parameter type-id='type-id-3618'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3778' is-artificial='yes'/>
+            <parameter type-id='type-id-3648'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor20RemoteCommandRequestEED2Ev'>
-            <parameter type-id='type-id-3748' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3778' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3619'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3512'/>
+      <class-decl name='allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='92' column='1' id='type-id-3649'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3543'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3893'>
+          <class-decl name='rebind&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='104' column='1' id='type-id-3927'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3619' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3894'/>
+              <typedef-decl name='other' type-id='type-id-3649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='105' column='1' id='type-id-3928'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='public'>
           <function-decl name='allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-3750' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3780' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3750' is-artificial='yes'/>
-            <parameter type-id='type-id-3621'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3780' is-artificial='yes'/>
+            <parameter type-id='type-id-3651'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~allocator' mangled-name='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/allocator.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSaIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-3750' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3780' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3493'>
+      <class-decl name='initializer_list&lt;mongo::executor::RemoteCommandRequest&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='47' column='1' id='type-id-3519'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-387' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3895'/>
+          <typedef-decl name='const_iterator' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3929'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-387' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3896'/>
+          <typedef-decl name='iterator' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3930'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-3896' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
+          <var-decl name='_M_array' type-id='type-id-3930' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='58' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_len' type-id='type-id-93' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-98' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3755' is-artificial='yes'/>
-            <parameter type-id='type-id-3895'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3785' is-artificial='yes'/>
+            <parameter type-id='type-id-3929'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='initializer_list' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3755' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3785' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-3624'>
+      <class-decl name='move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='947' column='1' id='type-id-3654'>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-3897'/>
+          <typedef-decl name='iterator_type' type-id='type-id-1486' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-3931'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3758' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-3898'/>
+          <typedef-decl name='reference' type-id='type-id-3788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-3932'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_current' type-id='type-id-1473' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='950' column='1'/>
+          <var-decl name='_M_current' type-id='type-id-1486' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='950' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='move_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3757' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3787' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='move_iterator' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEC2ES4_'>
-            <parameter type-id='type-id-3757' is-artificial='yes'/>
-            <parameter type-id='type-id-3897'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3787' is-artificial='yes'/>
+            <parameter type-id='type-id-3931'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv'>
-            <parameter type-id='type-id-3627' is-artificial='yes'/>
-            <return type-id='type-id-3898'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <return type-id='type-id-3932'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='987' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEppEv'>
-            <parameter type-id='type-id-3757' is-artificial='yes'/>
-            <return type-id='type-id-3756'/>
+            <parameter type-id='type-id-3787' is-artificial='yes'/>
+            <return type-id='type-id-3786'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEE4baseEv'>
-            <parameter type-id='type-id-3627' is-artificial='yes'/>
-            <return type-id='type-id-3897'/>
+            <parameter type-id='type-id-3657' is-artificial='yes'/>
+            <return type-id='type-id-3931'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3628'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3561'/>
+      <class-decl name='tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3658'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3591'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3793' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3825' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3793' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3825' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3793' is-artificial='yes'/>
-            <parameter type-id='type-id-3630'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3825' is-artificial='yes'/>
+            <parameter type-id='type-id-3660'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3793' is-artificial='yes'/>
-            <parameter type-id='type-id-3792'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3825' is-artificial='yes'/>
+            <parameter type-id='type-id-3824'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3564'/>
+      <class-decl name='tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3661'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3594'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3795' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3827' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3795' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3827' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3795' is-artificial='yes'/>
-            <parameter type-id='type-id-3633'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3827' is-artificial='yes'/>
+            <parameter type-id='type-id-3663'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3795' is-artificial='yes'/>
-            <parameter type-id='type-id-3794'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3827' is-artificial='yes'/>
+            <parameter type-id='type-id-3826'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3634'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3567'/>
+      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3664'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3597'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-3636'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <parameter type-id='type-id-3666'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_'>
-            <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <parameter type-id='type-id-3829'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_vEEOT_OT0_'>
-            <parameter type-id='type-id-3798' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3637'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3573'/>
+      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='390' column='1' id='type-id-3667'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3603'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='399' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3673'/>
-            <parameter type-id='type-id-3665'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3703'/>
+            <parameter type-id='type-id-3695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-3639'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3669'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-3800'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3832'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IJRKS1_S5_SB_EvEEDpOT_'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3640'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3579'/>
+      <class-decl name='tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='523' column='1' id='type-id-3670'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3609'/>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='528' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3804' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3836' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='532' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3804' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3836' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3703'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3804' is-artificial='yes'/>
-            <parameter type-id='type-id-3642'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3836' is-artificial='yes'/>
+            <parameter type-id='type-id-3672'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='544' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3804' is-artificial='yes'/>
-            <parameter type-id='type-id-3803'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3836' is-artificial='yes'/>
+            <parameter type-id='type-id-3835'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_S5_vEEOT_OT0_'>
-            <parameter type-id='type-id-3804' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3836' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3472'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3473'/>
+      <class-decl name='vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3498'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3499'/>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3475' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3474'/>
+          <typedef-decl name='const_reference' type-id='type-id-3501' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3500'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3477' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3476'/>
+          <typedef-decl name='pointer' type-id='type-id-3503' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3502'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3478'/>
+          <typedef-decl name='reference' type-id='type-id-3505' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3504'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3481' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3480'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3506'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3483' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3482'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3509' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3508'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3485' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3484'/>
+          <typedef-decl name='iterator' type-id='type-id-3511' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3510'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3487' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3486'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3513' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3512'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3490'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3516'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3491'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3517'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3492'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3518'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3491'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3517'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3492'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3518'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-3493'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-3519'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4sizeEv'>
-            <parameter type-id='type-id-3494' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3520' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm'>
-            <parameter type-id='type-id-3488' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <return type-id='type-id-3478'/>
+            <parameter type-id='type-id-3514' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <return type-id='type-id-3504'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3646'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3607'/>
+      <class-decl name='vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='214' column='1' id='type-id-3676'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3637'/>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3504' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3899'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3535' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='233' column='1' id='type-id-3933'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3881' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3900'/>
+          <typedef-decl name='const_reference' type-id='type-id-3914' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='230' column='1' id='type-id-3934'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3507' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3901'/>
+          <typedef-decl name='iterator' type-id='type-id-3538' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='231' column='1' id='type-id-3935'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3903' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3902'/>
+          <typedef-decl name='pointer' type-id='type-id-3937' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='227' column='1' id='type-id-3936'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3884' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3904'/>
+          <typedef-decl name='reference' type-id='type-id-3917' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='229' column='1' id='type-id-3938'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3906' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3905'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3940' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='234' column='1' id='type-id-3939'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3908' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3907'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3942' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='235' column='1' id='type-id-3941'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-3652'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-3682'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3648'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3678'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3808'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3840'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='339' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3648'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3678'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3808'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3840'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3909'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3943'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backERKS3_'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-3652'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3682'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5emptyEv'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
             <return type-id='type-id-1'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4sizeEv'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <return type-id='type-id-3901'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <return type-id='type-id-3935'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <return type-id='type-id-3901'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <return type-id='type-id-3935'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5beginEv'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
-            <return type-id='type-id-3899'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
+            <return type-id='type-id-3933'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE3endEv'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
-            <return type-id='type-id-3899'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
+            <return type-id='type-id-3933'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_'>
-            <parameter type-id='type-id-3809' is-artificial='yes'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_M_check_lenEmPKc'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
-            <parameter type-id='type-id-93'/>
-            <parameter type-id='type-id-58'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
+            <parameter type-id='type-id-98'/>
+            <parameter type-id='type-id-63'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8max_sizeEv'>
-            <parameter type-id='type-id-3649' is-artificial='yes'/>
-            <return type-id='type-id-93'/>
+            <parameter type-id='type-id-3679' is-artificial='yes'/>
+            <return type-id='type-id-98'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3910'>
+      <class-decl name='_Bind_helper&lt;false, void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3944'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2857' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3767'/>
+          <typedef-decl name='type' type-id='type-id-2882' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3797'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3911'>
+      <class-decl name='_Bind_helper&lt;false, void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3945'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3765'/>
+          <typedef-decl name='type' type-id='type-id-2885' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3795'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3912'>
+      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1601' column='1' id='type-id-3946'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3541' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3763'/>
+          <typedef-decl name='type' type-id='type-id-3571' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3793'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Destroy_aux&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='96' column='1' id='type-id-3913'>
+      <class-decl name='_Destroy_aux&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='96' column='1' id='type-id-3947'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_'>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-1473'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1486'/>
+            <parameter type-id='type-id-1486'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::executor::RemoteCommandRequest *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor20RemoteCommandRequestEEEvT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor20RemoteCommandRequestEEEvT_S6_'>
-            <parameter type-id='type-id-1464'/>
-            <parameter type-id='type-id-1464'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-1477'/>
+            <parameter type-id='type-id-1477'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3546'>
+      <class-decl name='_Head_base&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3576'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-408' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-421' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3715' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EEC2ES5_'>
-            <parameter type-id='type-id-3685' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3715' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685' is-artificial='yes'/>
-            <parameter type-id='type-id-3548'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3715' is-artificial='yes'/>
+            <parameter type-id='type-id-3578'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685' is-artificial='yes'/>
-            <parameter type-id='type-id-3684'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3715' is-artificial='yes'/>
+            <parameter type-id='type-id-3714'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3715' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERS6_'>
-            <parameter type-id='type-id-3683'/>
-            <return type-id='type-id-408'/>
+            <parameter type-id='type-id-3713'/>
+            <return type-id='type-id-421'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3549'>
+      <class-decl name='_Head_base&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3579'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1471' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1484' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EEC2ES4_'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3551'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3581'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3687'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-3717'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3718' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERS5_'>
-            <parameter type-id='type-id-3686'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-3716'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3552'>
+      <class-decl name='_Head_base&lt;1, mongo::repl::ScatterGatherRunner *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3582'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-3671' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-3701' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3703'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <parameter type-id='type-id-3554'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3584'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <parameter type-id='type-id-3690'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3720'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EEC2IS3_EEOT_'>
-            <parameter type-id='type-id-3691' is-artificial='yes'/>
-            <parameter type-id='type-id-3675'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3705'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERS4_'>
-            <parameter type-id='type-id-3689'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3719'/>
+            <return type-id='type-id-3704'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3555'>
+      <class-decl name='_Head_base&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='129' column='1' id='type-id-3585'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-1451' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
+          <var-decl name='_M_head_impl' type-id='type-id-1464' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='174' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <parameter type-id='type-id-3665'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <parameter type-id='type-id-3695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <parameter type-id='type-id-3557'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <parameter type-id='type-id-3587'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <parameter type-id='type-id-3693'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <parameter type-id='type-id-3723'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <parameter type-id='type-id-2936'/>
-            <parameter type-id='type-id-2937'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <parameter type-id='type-id-2961'/>
+            <parameter type-id='type-id-2962'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EEC2IS6_EEOT_'>
-            <parameter type-id='type-id-3694' is-artificial='yes'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3724' is-artificial='yes'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERS7_'>
-            <parameter type-id='type-id-3692'/>
-            <return type-id='type-id-3666'/>
+            <parameter type-id='type-id-3722'/>
+            <return type-id='type-id-3696'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-3914'/>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='504' column='1' id='type-id-3890'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3915'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='78' column='1' id='type-id-3948'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='504' column='1' id='type-id-3923'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3949'/>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3916'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3950'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_'>
-            <parameter type-id='type-id-3816'/>
-            <return type-id='type-id-3816'/>
+            <parameter type-id='type-id-3848'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3917'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1191' column='1' id='type-id-3951'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_'>
-            <parameter type-id='type-id-3822'/>
-            <return type-id='type-id-3822'/>
+            <parameter type-id='type-id-3854'/>
+            <return type-id='type-id-3854'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-3918'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1210' column='1' id='type-id-3952'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEE9__do_wrapES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEE9__do_wrapES9_'>
-            <return type-id='type-id-3769'/>
+            <parameter type-id='type-id-3527'/>
+            <return type-id='type-id-3799'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3561'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3546'/>
+      <class-decl name='_Tuple_impl&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3591'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3576'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEC2ES5_'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-408'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-421'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3563'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3593'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3700' is-artificial='yes'/>
-            <parameter type-id='type-id-3699'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3730' is-artificial='yes'/>
+            <parameter type-id='type-id-3729'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3698'/>
-            <return type-id='type-id-408'/>
+            <parameter type-id='type-id-3728'/>
+            <return type-id='type-id-421'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3564'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1852'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3549'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3594'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1865'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3579'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3703' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3733' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEC2ES4_'>
-            <parameter type-id='type-id-3703' is-artificial='yes'/>
-            <parameter type-id='type-id-1471'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3733' is-artificial='yes'/>
+            <parameter type-id='type-id-1484'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3703' is-artificial='yes'/>
-            <parameter type-id='type-id-3566'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3733' is-artificial='yes'/>
+            <parameter type-id='type-id-3596'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3703' is-artificial='yes'/>
-            <parameter type-id='type-id-3702'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3733' is-artificial='yes'/>
+            <parameter type-id='type-id-3732'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERS5_'>
-            <parameter type-id='type-id-3701'/>
-            <return type-id='type-id-1471'/>
+            <parameter type-id='type-id-3731'/>
+            <return type-id='type-id-1484'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3567'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3594'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-532'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3597'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3624'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-544'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3594' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3570'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3624' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3600'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-1500'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-1513'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-3569'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3599'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_'>
-            <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-3705'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-3735'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3706' is-artificial='yes'/>
-            <parameter type-id='type-id-1501'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3736' is-artificial='yes'/>
+            <parameter type-id='type-id-1514'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_tailERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-3704'/>
-            <return type-id='type-id-3707'/>
+            <parameter type-id='type-id-3734'/>
+            <return type-id='type-id-3737'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3704'/>
-            <return type-id='type-id-1501'/>
+            <parameter type-id='type-id-3734'/>
+            <return type-id='type-id-1514'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3573'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3585'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-538'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3603'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3615'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-550'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3585' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3576'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3615' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3606'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3710' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3740' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3673'/>
-            <parameter type-id='type-id-3665'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3740' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3703'/>
+            <parameter type-id='type-id-3695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-3575'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3740' is-artificial='yes'/>
+            <parameter type-id='type-id-3605'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2EOSC_'>
-            <parameter type-id='type-id-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-3709'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3740' is-artificial='yes'/>
+            <parameter type-id='type-id-3739'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEC2IRKS1_JS5_SB_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3740' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSC_'>
-            <parameter type-id='type-id-3708'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-3738'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSC_'>
-            <parameter type-id='type-id-3708'/>
-            <return type-id='type-id-3711'/>
+            <parameter type-id='type-id-3738'/>
+            <return type-id='type-id-3741'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3579'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3591'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-538'/>
+      <class-decl name='_Tuple_impl&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3609'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3621'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-550'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3591' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3582'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3621' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3612'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3714' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3744' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3744' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3703'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-3581'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3744' is-artificial='yes'/>
+            <parameter type-id='type-id-3611'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2EOS6_'>
-            <parameter type-id='type-id-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-3713'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3744' is-artificial='yes'/>
+            <parameter type-id='type-id-3743'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEC2IRKS1_JS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <parameter type-id='type-id-3675'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3744' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <parameter type-id='type-id-3705'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS6_'>
-            <parameter type-id='type-id-3712'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-3742'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-3712'/>
-            <return type-id='type-id-3715'/>
+            <parameter type-id='type-id-3742'/>
+            <return type-id='type-id-3745'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3585'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3597'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3552'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3615'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3627'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3582'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3588'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3627' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3618'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3718' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3718' is-artificial='yes'/>
-            <parameter type-id='type-id-3673'/>
-            <parameter type-id='type-id-3665'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3703'/>
+            <parameter type-id='type-id-3695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3718' is-artificial='yes'/>
-            <parameter type-id='type-id-3587'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3617'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOSA_'>
-            <parameter type-id='type-id-3718' is-artificial='yes'/>
-            <parameter type-id='type-id-3717'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3747'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS3_JS9_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3718' is-artificial='yes'/>
-            <parameter type-id='type-id-3675'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3705'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERSA_'>
-            <parameter type-id='type-id-3716'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3746'/>
+            <return type-id='type-id-3704'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERSA_'>
-            <parameter type-id='type-id-3716'/>
-            <return type-id='type-id-3719'/>
+            <parameter type-id='type-id-3746'/>
+            <return type-id='type-id-3749'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3591'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3552'/>
+      <class-decl name='_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3621'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3582'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3722' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3752' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3722' is-artificial='yes'/>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3752' is-artificial='yes'/>
+            <parameter type-id='type-id-3703'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3722' is-artificial='yes'/>
-            <parameter type-id='type-id-3593'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3752' is-artificial='yes'/>
+            <parameter type-id='type-id-3623'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2EOS4_'>
-            <parameter type-id='type-id-3722' is-artificial='yes'/>
-            <parameter type-id='type-id-3721'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3752' is-artificial='yes'/>
+            <parameter type-id='type-id-3751'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ScatterGatherRunner *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEC2IS3_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3722' is-artificial='yes'/>
-            <parameter type-id='type-id-3675'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3752' is-artificial='yes'/>
+            <parameter type-id='type-id-3705'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERS4_'>
-            <parameter type-id='type-id-3720'/>
-            <return type-id='type-id-3674'/>
+            <parameter type-id='type-id-3750'/>
+            <return type-id='type-id-3704'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERS4_'>
-            <parameter type-id='type-id-3720'/>
-            <return type-id='type-id-1831'/>
+            <parameter type-id='type-id-3750'/>
+            <return type-id='type-id-1844'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3594'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1875'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-562'/>
+      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3624'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1888'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-574'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3725' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2ERKS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2ERKS1_'>
-            <parameter type-id='type-id-3725' is-artificial='yes'/>
-            <parameter type-id='type-id-676'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3725' is-artificial='yes'/>
-            <parameter type-id='type-id-3596'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <parameter type-id='type-id-3626'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2EOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2EOS2_'>
-            <parameter type-id='type-id-3725' is-artificial='yes'/>
-            <parameter type-id='type-id-3724'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <parameter type-id='type-id-3754'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_tailERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_tailERS2_'>
-            <parameter type-id='type-id-3723'/>
-            <return type-id='type-id-1831'/>
+            <parameter type-id='type-id-3753'/>
+            <return type-id='type-id-1844'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_headERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_headERS2_'>
-            <parameter type-id='type-id-3723'/>
-            <return type-id='type-id-1721'/>
+            <parameter type-id='type-id-3753'/>
+            <return type-id='type-id-1734'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3597'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1894'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3555'/>
+      <class-decl name='_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='231' column='1' id='type-id-3627'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1907'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3585'/>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3728' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3758' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3728' is-artificial='yes'/>
-            <parameter type-id='type-id-3665'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3758' is-artificial='yes'/>
+            <parameter type-id='type-id-3695'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3728' is-artificial='yes'/>
-            <parameter type-id='type-id-3599'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3758' is-artificial='yes'/>
+            <parameter type-id='type-id-3629'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2EOS7_'>
-            <parameter type-id='type-id-3728' is-artificial='yes'/>
-            <parameter type-id='type-id-3727'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3758' is-artificial='yes'/>
+            <parameter type-id='type-id-3757'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, void&gt;' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEC2IS6_JEvEEOT_DpOT0_'>
-            <parameter type-id='type-id-3728' is-artificial='yes'/>
-            <parameter type-id='type-id-3667'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3758' is-artificial='yes'/>
+            <parameter type-id='type-id-3697'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERS7_'>
-            <parameter type-id='type-id-3726'/>
-            <return type-id='type-id-3666'/>
+            <parameter type-id='type-id-3756'/>
+            <return type-id='type-id-3696'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERS7_'>
-            <parameter type-id='type-id-3726'/>
-            <return type-id='type-id-1862'/>
+            <parameter type-id='type-id-3756'/>
+            <return type-id='type-id-1875'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3473'>
+      <class-decl name='_Vector_base&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3499'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3733'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3616'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3763'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3646'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3477' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-3503' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-3477' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-3503' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-3477' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-3503' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3735' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3765' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3735' is-artificial='yes'/>
-                <parameter type-id='type-id-3604'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3765' is-artificial='yes'/>
+                <parameter type-id='type-id-3634'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3735' is-artificial='yes'/>
-                <parameter type-id='type-id-3732'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3765' is-artificial='yes'/>
+                <parameter type-id='type-id-3762'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3872' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3602'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3905' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3632'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3616' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3605'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3646' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3635'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3874' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3477'/>
+          <typedef-decl name='pointer' type-id='type-id-3907' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3503'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3733' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3763' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3732'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3762'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3729'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3759'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3729'/>
-            <parameter type-id='type-id-3489'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3759'/>
+            <parameter type-id='type-id-3515'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <return type-id='type-id-3731'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <return type-id='type-id-3761'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13_M_deallocateEPS2_m'>
-            <parameter type-id='type-id-3730' is-artificial='yes'/>
-            <parameter type-id='type-id-3477'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3503'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3607'>
+      <class-decl name='_Vector_base&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='72' column='1' id='type-id-3637'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3740'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3619'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='79' column='1' id='type-id-3770'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3649'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3903' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-3937' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='82' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-3903' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-3937' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-3903' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-3937' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_implC2Ev'>
-                <parameter type-id='type-id-3742' is-artificial='yes'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3772' is-artificial='yes'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3742' is-artificial='yes'/>
-                <parameter type-id='type-id-3612'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3772' is-artificial='yes'/>
+                <parameter type-id='type-id-3642'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3742' is-artificial='yes'/>
-                <parameter type-id='type-id-3739'/>
-                <return type-id='type-id-2675'/>
+                <parameter type-id='type-id-3772' is-artificial='yes'/>
+                <parameter type-id='type-id-3769'/>
+                <return type-id='type-id-2697'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3879' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3610'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3912' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='75' column='1' id='type-id-3640'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3619' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3613'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='110' column='1' id='type-id-3643'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3882' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3903'/>
+          <typedef-decl name='pointer' type-id='type-id-3915' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='77' column='1' id='type-id-3937'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3740' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3770' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='164' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEC2Ev'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-3739'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-3769'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-3736'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-3766'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-3736'/>
-            <parameter type-id='type-id-3615'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-3766'/>
+            <parameter type-id='type-id-3645'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EED2Ev'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE11_M_allocateEm'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-3903'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-3937'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <return type-id='type-id-3738'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <return type-id='type-id-3768'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13_M_deallocateEPS3_m'>
-            <parameter type-id='type-id-3737' is-artificial='yes'/>
-            <parameter type-id='type-id-3903'/>
-            <parameter type-id='type-id-92'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3767' is-artificial='yes'/>
+            <parameter type-id='type-id-3937'/>
+            <parameter type-id='type-id-97'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE19_M_get_Tp_allocatorEv'>
-            <parameter type-id='type-id-3609' is-artificial='yes'/>
-            <return type-id='type-id-3612'/>
+            <parameter type-id='type-id-3639' is-artificial='yes'/>
+            <return type-id='type-id-3642'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3885'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3919'/>
+      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3918'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3953'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3887'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3920'/>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3920'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3954'/>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3886'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3921'/>
+      <class-decl name='_Weak_result_type&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='184' column='1' id='type-id-3919'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3955'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-3919'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3914'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='86' column='1' id='type-id-3953'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3948'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3920'/>
-      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3921'/>
-      <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3922'>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3954'/>
+      <class-decl name='_Weak_result_type_impl&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='134' column='1' id='type-id-3955'/>
+      <class-decl name='__add_ref&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3956'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-408' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2811'/>
+          <typedef-decl name='type' type-id='type-id-421' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-2836'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3923'>
+      <class-decl name='__add_ref&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3957'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3666' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3924'/>
+          <typedef-decl name='type' type-id='type-id-3696' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3958'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3925'>
+      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='66' column='1' id='type-id-3959'>
       </class-decl>
-      <class-decl name='__add_ref&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3926'>
+      <class-decl name='__add_ref&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='62' column='1' id='type-id-3960'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3674' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3927'/>
+          <typedef-decl name='type' type-id='type-id-3704' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-3961'/>
         </member-type>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3928'>
+      <class-decl name='__add_rvalue_reference_helper&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3962'>
       </class-decl>
-      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3929'>
+      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1530' column='1' id='type-id-3963'>
       </class-decl>
-      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt;, mongo::executor::RemoteCommandRequest, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3930'>
+      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt;, mongo::executor::RemoteCommandRequest, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3964'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3892' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3931'/>
+          <typedef-decl name='__type' type-id='type-id-3926' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3965'/>
         </member-type>
       </class-decl>
-      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, mongo::executor::TaskExecutor::CallbackHandle, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3932'>
+      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, mongo::executor::TaskExecutor::CallbackHandle, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='63' column='1' id='type-id-3966'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3894' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3933'/>
+          <typedef-decl name='__type' type-id='type-id-3928' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='65' column='1' id='type-id-3967'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::executor::RemoteCommandRequest, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3934'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::executor::RemoteCommandRequest, mongo::executor::RemoteCommandRequest&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3968'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-384' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3743'/>
+          <typedef-decl name='__type' type-id='type-id-397' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3773'/>
         </member-type>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3935'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='105' column='1' id='type-id-3969'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-398' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3745'/>
+          <typedef-decl name='__type' type-id='type-id-411' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3775'/>
         </member-type>
       </class-decl>
-      <class-decl name='__uninitialized_copy&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='64' column='1' id='type-id-3936'>
+      <class-decl name='__uninitialized_copy&lt;false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='64' column='1' id='type-id-3970'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_'>
-            <parameter type-id='type-id-3624'/>
-            <parameter type-id='type-id-3624'/>
-            <parameter type-id='type-id-1473'/>
-            <return type-id='type-id-1473'/>
+            <parameter type-id='type-id-3654'/>
+            <parameter type-id='type-id-3654'/>
+            <parameter type-id='type-id-1486'/>
+            <return type-id='type-id-1486'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3870'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3903'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3865' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3937'/>
+          <typedef-decl name='__pointer' type-id='type-id-3898' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3971'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3937' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3875'/>
+          <typedef-decl name='pointer' type-id='type-id-3971' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3908'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3931' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3873'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3965' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3906'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3644' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3751'/>
+          <typedef-decl name='value_type' type-id='type-id-3674' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3781'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3939' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3938'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3973' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3972'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3938' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3940'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3972' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3974'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE10deallocateERS3_PS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE10deallocateERS3_PS2_m'>
-            <parameter type-id='type-id-3747'/>
-            <parameter type-id='type-id-3875'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3777'/>
+            <parameter type-id='type-id-3908'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3877'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='80' column='1' id='type-id-3910'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3860' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3941'/>
+          <typedef-decl name='__pointer' type-id='type-id-3893' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' id='type-id-3975'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3941' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3883'/>
+          <typedef-decl name='pointer' type-id='type-id-3975' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='102' column='1' id='type-id-3916'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3933' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3880'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3967' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3913'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3650' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3753'/>
+          <typedef-decl name='value_type' type-id='type-id-3680' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='85' column='1' id='type-id-3783'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3943' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3942'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3977' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3976'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3942' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3944'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3976' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='135' column='1' id='type-id-3978'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-3945'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-1486'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-3979'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1473'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-1486'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10deallocateERS4_PS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10deallocateERS4_PS3_m'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-3883'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-3916'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1473'/>
-            <return type-id='type-id-3946'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-1486'/>
+            <return type-id='type-id-3980'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8allocateERS4_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8allocateERS4_m'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-3065'/>
-            <return type-id='type-id-3883'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-3090'/>
+            <return type-id='type-id-3916'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8max_sizeERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8max_sizeERKS4_'>
-            <parameter type-id='type-id-3621'/>
-            <return type-id='type-id-3065'/>
+            <parameter type-id='type-id-3651'/>
+            <return type-id='type-id-3090'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_max_size&lt;const std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;, void&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE11_S_max_sizeIKS4_vEEmRT_i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE11_S_max_sizeIKS4_vEEmRT_i'>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3651'/>
             <parameter type-id='type-id-40'/>
-            <return type-id='type-id-3065'/>
+            <return type-id='type-id-3090'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_'>
-            <parameter type-id='type-id-3749'/>
-            <parameter type-id='type-id-1473'/>
-            <parameter type-id='type-id-400'/>
-            <return type-id='type-id-3945'/>
+            <parameter type-id='type-id-3779'/>
+            <parameter type-id='type-id-1486'/>
+            <parameter type-id='type-id-413'/>
+            <return type-id='type-id-3979'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='binary_function&lt;mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-3915'/>
-      <class-decl name='iterator_traits&lt;const mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-3947'>
+      <class-decl name='binary_function&lt;mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_function.h' line='118' column='1' id='type-id-3949'/>
+      <class-decl name='iterator_traits&lt;const mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='186' column='1' id='type-id-3981'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-401' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3856'/>
+          <typedef-decl name='pointer' type-id='type-id-414' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3889'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3858'/>
+          <typedef-decl name='reference' type-id='type-id-413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3891'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-3948'>
+      <class-decl name='iterator_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='175' column='1' id='type-id-3982'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1473' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3860'/>
+          <typedef-decl name='pointer' type-id='type-id-1486' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3893'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1471' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3862'/>
+          <typedef-decl name='reference' type-id='type-id-1484' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3895'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-398' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3650'/>
+          <typedef-decl name='value_type' type-id='type-id-411' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3680'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;mongo::executor::RemoteCommandRequest *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3949'>
+      <class-decl name='pointer_traits&lt;mongo::executor::RemoteCommandRequest *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3983'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-387' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3950'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-400' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3984'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3939'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3973'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3951'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3985'/>
         </member-type>
       </class-decl>
-      <class-decl name='pointer_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3952'>
+      <class-decl name='pointer_traits&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='150' column='1' id='type-id-3986'>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-401' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3953'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-414' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3987'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3943'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3977'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-52' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3954'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-57' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3988'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3955'>
+      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3989'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1451' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3759'/>
+          <typedef-decl name='type' type-id='type-id-1464' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3789'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3956'>
+      <class-decl name='remove_reference&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3990'>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3957'>
+      <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3991'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3671' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3761'/>
+          <typedef-decl name='type' type-id='type-id-3701' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3791'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3958'>
+      <class-decl name='remove_reference&lt;mongo::repl::ScatterGatherRunner *&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3992'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3959'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3993'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3960'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3994'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3961'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3995'>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3962'>
+      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3996'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3558' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3769'/>
+          <typedef-decl name='type' type-id='type-id-3588' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3799'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3963'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3997'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3585' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3771'/>
+          <typedef-decl name='type' type-id='type-id-3615' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3801'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3964'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3998'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3591' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3773'/>
+          <typedef-decl name='type' type-id='type-id-3621' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3803'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3965'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3999'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3594' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3775'/>
+          <typedef-decl name='type' type-id='type-id-3624' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3805'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3966'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4000'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3597' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3777'/>
+          <typedef-decl name='type' type-id='type-id-3627' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3807'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3967'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4001'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3634' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3779'/>
+          <typedef-decl name='type' type-id='type-id-3664' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3809'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3968'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4002'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3637' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3781'/>
+          <typedef-decl name='type' type-id='type-id-3667' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3811'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3969'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4003'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3640' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3783'/>
+          <typedef-decl name='type' type-id='type-id-3670' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3813'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3970'>
+      <class-decl name='remove_reference&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4004'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3811' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3785'/>
+          <typedef-decl name='type' type-id='type-id-3843' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3815'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3971'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4005'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3812' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3787'/>
+          <typedef-decl name='type' type-id='type-id-3844' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3817'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-3972'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1504' column='1' id='type-id-4006'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3818' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3789'/>
+          <typedef-decl name='type' type-id='type-id-3850' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-3819'/>
         </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3973'>
+      <class-decl name='remove_reference&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-4007'>
+      </class-decl>
+      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-4008'>
+        <member-type access='public'>
+          <typedef-decl name='type' type-id='type-id-3527' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-3822'/>
+        </member-type>
       </class-decl>
-      <class-decl name='remove_reference&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1500' column='1' id='type-id-3974'/>
-      <typedef-decl name='_Require&lt;__has_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3945'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' type-id='type-id-2515' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3946'/>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3510' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3975'/>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3512' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-3976'/>
-      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-3833'/>
-      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-3835'/>
-      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3232'/>
-      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3909'/>
-      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3977'/>
-      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3978'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3483'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3906'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3487'/>
-      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3908'/>
-      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3979'/>
-      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3980'/>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-3838'/>
-      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3981'/>
-      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3841'/>
-      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3843'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3979'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' type-id='type-id-2536' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3980'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3541' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4009'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3543' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/x86_64-linux-gnu/c++/4.9/bits/c++allocator.h' line='48' column='1' id='type-id-4010'/>
+      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-3866'/>
+      <class-decl name='__weak_ptr&lt;mongo::executor::TaskExecutor::EventState, __gnu_cxx::_Lock_policy::_S_atomic&gt;' visibility='default' is-declaration-only='yes' id='type-id-3868'/>
+      <class-decl name='basic_string&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3257'/>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3943'/>
+      <class-decl name='list&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-4011'/>
+      <class-decl name='multiset&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-4012'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3509'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3940'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::RemoteCommandRequest *, std::vector&lt;mongo::executor::RemoteCommandRequest, std::allocator&lt;mongo::executor::RemoteCommandRequest&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3513'/>
+      <class-decl name='reverse_iterator&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3942'/>
+      <class-decl name='set&lt;mongo::BSONElement, mongo::BSONElementCmpWithoutField, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-4013'/>
+      <class-decl name='set&lt;std::basic_string&lt;char&gt;, std::less&lt;std::basic_string&lt;char&gt; &gt;, std::allocator&lt;std::basic_string&lt;char&gt; &gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-4014'/>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-3871'/>
+      <class-decl name='vector&lt;mongo::BSONElement, std::allocator&lt;mongo::BSONElement&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-4015'/>
+      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::CallbackState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3874'/>
+      <class-decl name='weak_ptr&lt;mongo::executor::TaskExecutor::EventState&gt;' visibility='default' is-declaration-only='yes' id='type-id-3876'/>
       <function-decl name='__addressof&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt11__addressofIN5mongo8executor20RemoteCommandRequestEEPT_RS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo8executor20RemoteCommandRequestEEPT_RS3_'>
-        <parameter type-id='type-id-1462' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1464'/>
+        <parameter type-id='type-id-1475' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1477'/>
       </function-decl>
       <function-decl name='__addressof&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt11__addressofIN5mongo8executor12TaskExecutor14CallbackHandleEEPT_RS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__addressofIN5mongo8executor12TaskExecutor14CallbackHandleEEPT_RS4_'>
-        <parameter type-id='type-id-1471' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
-        <return type-id='type-id-1473'/>
+        <parameter type-id='type-id-1484' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
+        <return type-id='type-id-1486'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS8_E4typeE'>
-        <parameter type-id='type-id-3760' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3666'/>
+        <parameter type-id='type-id-3790' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3696'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt7forwardIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS7_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEOT_RNSt16remove_referenceIS7_E4typeE'>
-        <parameter type-id='type-id-3760' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3667'/>
+        <parameter type-id='type-id-3790' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3697'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ScatterGatherRunner *&amp;&gt;' mangled-name='_ZSt7forwardIRPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS5_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS5_E4typeE'>
-        <parameter type-id='type-id-3762' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3674'/>
+        <parameter type-id='type-id-3792' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3704'/>
       </function-decl>
       <function-decl name='forward&lt;mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt7forwardIPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS4_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPN5mongo4repl19ScatterGatherRunnerEEOT_RNSt16remove_referenceIS4_E4typeE'>
-        <parameter type-id='type-id-3762' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3675'/>
+        <parameter type-id='type-id-3792' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3705'/>
       </function-decl>
       <function-decl name='forward&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_E4typeE'>
-        <parameter type-id='type-id-3791' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3822'/>
+        <parameter type-id='type-id-3821' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3854'/>
       </function-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE'>
-        <parameter type-id='type-id-3786' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
-        <return type-id='type-id-3823'/>
+        <parameter type-id='type-id-3816' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3855'/>
       </function-decl>
       <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_E4typeE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_E4typeE'>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-3823' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='76' column='1'/>
+        <return type-id='type-id-3856'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor12TaskExecutor14CallbackHandleEEEPS4_St12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSK_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor12TaskExecutor14CallbackHandleEEEPS4_St12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSK_'>
-        <parameter type-id='type-id-3676' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3764'/>
+        <parameter type-id='type-id-3706' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3794'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS1_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES9_EEEONSt16remove_referenceIT_E4typeEOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS1_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES9_EEEONSt16remove_referenceIT_E4typeEOSI_'>
-        <parameter type-id='type-id-3679' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3766'/>
+        <parameter type-id='type-id-3709' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3796'/>
       </function-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS1_4repl19ScatterGatherRunnerEPNS1_10StatusWithINS3_11EventHandleEEEESt12_PlaceholderILi1EES9_SD_EEEONSt16remove_referenceIT_E4typeEOSM_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS1_4repl19ScatterGatherRunnerEPNS1_10StatusWithINS3_11EventHandleEEEESt12_PlaceholderILi1EES9_SD_EEEONSt16remove_referenceIT_E4typeEOSM_'>
-        <parameter type-id='type-id-3681' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3768'/>
+        <parameter type-id='type-id-3711' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3798'/>
       </function-decl>
       <function-decl name='move&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-3695' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3770'/>
+        <parameter type-id='type-id-3725' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3800'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS1_10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS1_10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-3716' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3772'/>
+        <parameter type-id='type-id-3746' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3802'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOS8_'>
-        <parameter type-id='type-id-3720' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3774'/>
+        <parameter type-id='type-id-3750' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3804'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-3723' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3776'/>
+        <parameter type-id='type-id-3753' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3806'/>
       </function-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm2EJPN5mongo10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt11_Tuple_implILm2EJPN5mongo10StatusWithINS1_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSB_'>
-        <parameter type-id='type-id-3726' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3778'/>
+        <parameter type-id='type-id-3756' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3808'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-3796' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3780'/>
+        <parameter type-id='type-id-3828' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3810'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS3_10StatusWithINS3_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS3_10StatusWithINS3_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSG_'>
-        <parameter type-id='type-id-3799' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3782'/>
+        <parameter type-id='type-id-3831' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3812'/>
       </function-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-3802' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3784'/>
+        <parameter type-id='type-id-3834' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3814'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEONSt16remove_referenceIT_E4typeEOSH_'>
-        <parameter type-id='type-id-3815' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3788'/>
+        <parameter type-id='type-id-3847' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3818'/>
       </function-decl>
       <function-decl name='move&lt;void (*&amp;)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4moveIRPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEONSt16remove_referenceIT_E4typeEOSD_'>
-        <parameter type-id='type-id-3821' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
-        <return type-id='type-id-3790'/>
+        <parameter type-id='type-id-3853' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='101' column='1'/>
+        <return type-id='type-id-3820'/>
       </function-decl>
       <function-decl name='for_each&lt;__gnu_cxx::__normal_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;, std::_Bind&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; (mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt;)&gt; &gt;' mangled-name='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8for_eachIN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS5_SaIS5_EEEESt5_BindIFSt7_Mem_fnIMNS2_4repl19ReplicationExecutorEFvRKS5_EEPSE_St12_PlaceholderILi1EEEEET0_T_SQ_SP_'>
-        <parameter type-id='type-id-3507' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
-        <parameter type-id='type-id-3507' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
-        <parameter type-id='type-id-3541' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
-        <return type-id='type-id-3541'/>
+        <parameter type-id='type-id-3538' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
+        <parameter type-id='type-id-3538' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
+        <parameter type-id='type-id-3571' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algo.h' line='3750' column='1'/>
+        <return type-id='type-id-3571'/>
       </function-decl>
       <function-decl name='max&lt;unsigned long&gt;' mangled-name='_ZSt3maxImERKT_S2_S2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3maxImERKT_S2_S2_'>
-        <parameter type-id='type-id-1335' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='356' column='1'/>
-        <parameter type-id='type-id-1335' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='356' column='1'/>
-        <return type-id='type-id-1335'/>
+        <parameter type-id='type-id-1347' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='356' column='1'/>
+        <parameter type-id='type-id-1347' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='356' column='1'/>
+        <return type-id='type-id-1347'/>
       </function-decl>
       <function-decl name='_Construct&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_'>
-        <parameter type-id='type-id-1473' name='__p' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
-        <parameter type-id='type-id-1472' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1486' name='__p' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
+        <parameter type-id='type-id-1485' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt8_DestroyIN5mongo8executor20RemoteCommandRequestEEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIN5mongo8executor20RemoteCommandRequestEEvPT_'>
-        <parameter type-id='type-id-1464' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1477' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt8_DestroyIN5mongo8executor12TaskExecutor14CallbackHandleEEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIN5mongo8executor12TaskExecutor14CallbackHandleEEvPT_'>
-        <parameter type-id='type-id-1473' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1486' name='__pointer' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='92' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_'>
-        <parameter type-id='type-id-1464' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <parameter type-id='type-id-1464' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1477' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1477' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_'>
-        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1486' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <parameter type-id='type-id-1486' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E'>
-        <parameter type-id='type-id-1464' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-1464' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-3747' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1477' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1477' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-3777' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E'>
-        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-3749' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-1486' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-1486' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
+        <parameter type-id='type-id-3779' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='operator==&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSteqIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_'>
-        <parameter type-id='type-id-3626' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
-        <parameter type-id='type-id-3626' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
+        <parameter type-id='type-id-3656' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1054' column='1'/>
+        <parameter type-id='type-id-3656' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1055' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='operator!=&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZStneIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_'>
-        <parameter type-id='type-id-3626' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
-        <parameter type-id='type-id-3626' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
+        <parameter type-id='type-id-3656' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
+        <parameter type-id='type-id-3656' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
         <return type-id='type-id-1'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_'>
-        <parameter type-id='type-id-1473' name='__i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
-        <return type-id='type-id-3624'/>
+        <parameter type-id='type-id-1486' name='__i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
+        <return type-id='type-id-3654'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_'>
-        <parameter type-id='type-id-3624' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-3624' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
-        <return type-id='type-id-1473'/>
+        <parameter type-id='type-id-3654' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-3654' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-1486' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
+        <return type-id='type-id-1486'/>
       </function-decl>
       <function-decl name='__uninitialized_copy_a&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E'>
-        <parameter type-id='type-id-3624' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-3624' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
-        <parameter type-id='type-id-3749' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
-        <return type-id='type-id-1473'/>
+        <parameter type-id='type-id-3654' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-3654' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-1486' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
+        <parameter type-id='type-id-3779' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
+        <return type-id='type-id-1486'/>
       </function-decl>
       <function-decl name='__uninitialized_move_if_noexcept_a&lt;mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle *, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' mangled-name='_ZSt34__uninitialized_move_if_noexcept_aIPN5mongo8executor12TaskExecutor14CallbackHandleES4_SaIS3_EET0_T_S7_S6_RT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt34__uninitialized_move_if_noexcept_aIPN5mongo8executor12TaskExecutor14CallbackHandleES4_SaIS3_EET0_T_S7_S6_RT1_'>
-        <parameter type-id='type-id-1473' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1'/>
-        <parameter type-id='type-id-1473' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='296' column='1'/>
-        <parameter type-id='type-id-1473' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='297' column='1'/>
-        <parameter type-id='type-id-3749' name='__alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='298' column='1'/>
-        <return type-id='type-id-1473'/>
+        <parameter type-id='type-id-1486' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1'/>
+        <parameter type-id='type-id-1486' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='296' column='1'/>
+        <parameter type-id='type-id-1486' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='297' column='1'/>
+        <parameter type-id='type-id-3779' name='__alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='298' column='1'/>
+        <return type-id='type-id-1486'/>
       </function-decl>
-      <typedef-decl name='string' type-id='type-id-3232' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-3328'/>
+      <typedef-decl name='string' type-id='type-id-3257' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stringfwd.h' line='62' column='1' id='type-id-3353'/>
       <namespace-decl name='chrono'>
       </namespace-decl>
       <function-decl name='bind&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEJRKSt12_PlaceholderILi1EES8_SC_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESK_JDpT0_EE4typeEOSK_DpOSL_'>
-        <parameter type-id='type-id-3823' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-3675' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-3667' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-3767'/>
+        <parameter type-id='type-id-3855' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-3705' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-3697' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-3797'/>
       </function-decl>
       <function-decl name='bind&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_'>
-        <parameter type-id='type-id-3822' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-3675' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-3765'/>
+        <parameter type-id='type-id-3854' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-3705' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-3795'/>
       </function-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_'>
-        <parameter type-id='type-id-1501' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <parameter type-id='type-id-676' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-3763'/>
+        <parameter type-id='type-id-3856' name='__f' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-1514' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <parameter type-id='type-id-688' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-3793'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-3698' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2811'/>
+        <parameter type-id='type-id-3728' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2836'/>
       </function-decl>
       <function-decl name='__get_helper&lt;2, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS8_DpT1_EE'>
-        <parameter type-id='type-id-3726' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3924'/>
+        <parameter type-id='type-id-3756' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3958'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt12__get_helperILm0ERN5mongo8executor12TaskExecutor14CallbackHandleEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ERN5mongo8executor12TaskExecutor14CallbackHandleEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS6_DpT1_EE'>
-        <parameter type-id='type-id-3701' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-3731' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0EPN5mongo4repl19ReplicationExecutorEJSt12_PlaceholderILi1EEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-3704' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-3734' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSB_DpT1_EE'>
-        <parameter type-id='type-id-3716' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3927'/>
+        <parameter type-id='type-id-3746' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3961'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1EPN5mongo4repl19ScatterGatherRunnerEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS5_DpT1_EE'>
-        <parameter type-id='type-id-3720' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3927'/>
+        <parameter type-id='type-id-3750' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3961'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJSD_DpT1_EE'>
-        <parameter type-id='type-id-3708' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3738' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm0ESt12_PlaceholderILi1EEJPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS7_DpT1_EE'>
-        <parameter type-id='type-id-3712' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3742' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::_Placeholder&lt;1&gt;&gt;' mangled-name='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE'>
-        <parameter type-id='type-id-3723' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3753' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='745' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;0, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-2818' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2811'/>
+        <parameter type-id='type-id-2843' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2836'/>
       </function-decl>
       <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm2EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3799' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3924'/>
+        <parameter type-id='type-id-3831' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3958'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt3getILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSA_'>
-        <parameter type-id='type-id-2802' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-2817'/>
+        <parameter type-id='type-id-2827' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3796' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3015'/>
+        <parameter type-id='type-id-3828' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3040'/>
       </function-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3799' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3927'/>
+        <parameter type-id='type-id-3831' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3961'/>
       </function-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3802' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3927'/>
+        <parameter type-id='type-id-3834' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3961'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3799' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3831' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3802' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3834' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3796' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-3020'/>
+        <parameter type-id='type-id-3828' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-3045'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEESt5tupleIJDpOT_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEESt5tupleIJDpOT_EES9_'>
-        <parameter type-id='type-id-408' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-3628'/>
+        <parameter type-id='type-id-421' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <return type-id='type-id-3658'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_'>
-        <parameter type-id='type-id-1471' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-3631'/>
+        <parameter type-id='type-id-1484' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
+        <return type-id='type-id-3661'/>
       </function-decl>
     </namespace-decl>
-    <typedef-decl name='FILE' type-id='type-id-3852' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-3826'/>
-    <typedef-decl name='__FILE' type-id='type-id-3852' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-3829'/>
+    <typedef-decl name='FILE' type-id='type-id-3885' filepath='/usr/include/stdio.h' line='48' column='1' id='type-id-3859'/>
+    <typedef-decl name='__FILE' type-id='type-id-3885' filepath='/usr/include/stdio.h' line='64' column='1' id='type-id-3862'/>
     <namespace-decl name='mongo'>
-      <class-decl name='ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt;' size-in-bits='320' visibility='default' filepath='src/mongo/util/scopeguard.h' line='277' column='1' id='type-id-3659'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3532'/>
+      <class-decl name='ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt;' size-in-bits='320' visibility='default' filepath='src/mongo/util/scopeguard.h' line='277' column='1' id='type-id-3689'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3563'/>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='obj_' type-id='type-id-3670' visibility='default' filepath='src/mongo/util/scopeguard.h' line='294' column='1'/>
+          <var-decl name='obj_' type-id='type-id-3700' visibility='default' filepath='src/mongo/util/scopeguard.h' line='294' column='1'/>
+        </data-member>
+        <data-member access='protected' layout-offset-in-bits='128'>
+          <var-decl name='memFun_' type-id='type-id-3530' visibility='default' filepath='src/mongo/util/scopeguard.h' line='295' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
-          <var-decl name='p1_' type-id='type-id-1499' visibility='default' filepath='src/mongo/util/scopeguard.h' line='296' column='1'/>
+          <var-decl name='p1_' type-id='type-id-1512' visibility='default' filepath='src/mongo/util/scopeguard.h' line='296' column='1'/>
         </data-member>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev' filepath='src/mongo/util/scopeguard.h' line='283' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev'>
-            <parameter type-id='type-id-3661' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_'>
-            <parameter type-id='type-id-3661' is-artificial='yes'/>
-            <parameter type-id='type-id-3670'/>
-            <parameter type-id='type-id-1498'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3700'/>
+            <parameter type-id='type-id-3530'/>
+            <parameter type-id='type-id-1511'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Execute' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E7ExecuteEv' filepath='src/mongo/util/scopeguard.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E7ExecuteEv'>
-            <parameter type-id='type-id-3661' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='MakeObjGuard' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_'>
-            <parameter type-id='type-id-3670'/>
-            <parameter type-id='type-id-1498'/>
-            <return type-id='type-id-3659'/>
+            <parameter type-id='type-id-3700'/>
+            <parameter type-id='type-id-3530'/>
+            <parameter type-id='type-id-1511'/>
+            <return type-id='type-id-3689'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ScopeGuardImplBase' size-in-bits='8' visibility='default' filepath='src/mongo/util/scopeguard.h' line='85' column='1' id='type-id-3532'>
+      <class-decl name='ScopeGuardImplBase' size-in-bits='8' visibility='default' filepath='src/mongo/util/scopeguard.h' line='85' column='1' id='type-id-3563'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='dismissed_' type-id='type-id-1' visibility='default' filepath='src/mongo/util/scopeguard.h' line='104' column='1'/>
         </data-member>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~ScopeGuardImplBase' mangled-name='_ZN5mongo18ScopeGuardImplBaseD2Ev' filepath='src/mongo/util/scopeguard.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBaseD2Ev'>
-            <parameter type-id='type-id-3663' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='ScopeGuardImplBase' filepath='src/mongo/util/scopeguard.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3663' is-artificial='yes'/>
-            <parameter type-id='type-id-3534'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <parameter type-id='type-id-3565'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ScopeGuardImplBase' mangled-name='_ZN5mongo18ScopeGuardImplBaseC2Ev' filepath='src/mongo/util/scopeguard.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBaseC2Ev'>
-            <parameter type-id='type-id-3663' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3693' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Dismiss' mangled-name='_ZNK5mongo18ScopeGuardImplBase7DismissEv' filepath='src/mongo/util/scopeguard.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18ScopeGuardImplBase7DismissEv'>
-            <parameter type-id='type-id-3535' is-artificial='yes'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3566' is-artificial='yes'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='SafeExecute&lt;mongo::ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt; &gt;' mangled-name='_ZN5mongo18ScopeGuardImplBase11SafeExecuteINS_18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS4_FvPNS3_19ReplicationExecutorEES6_EEEEvRT_' filepath='src/mongo/util/scopeguard.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBase11SafeExecuteINS_18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS4_FvPNS3_19ReplicationExecutorEES6_EEEEvRT_'>
-            <parameter type-id='type-id-3660'/>
-            <return type-id='type-id-2675'/>
+            <parameter type-id='type-id-3690'/>
+            <return type-id='type-id-2697'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='OperationContext' visibility='default' is-declaration-only='yes' id='type-id-3847'/>
-      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-3982'/>
-      <typedef-decl name='BSONElementSet' type-id='type-id-3979' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-3983'/>
-      <typedef-decl name='BSONElementMSet' type-id='type-id-3978' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-3984'/>
+      <class-decl name='OperationContext' visibility='default' is-declaration-only='yes' id='type-id-3880'/>
+      <class-decl name='StatusWith&lt;mongo::HostAndPort&gt;' visibility='default' is-declaration-only='yes' id='type-id-4016'/>
+      <typedef-decl name='BSONElementSet' type-id='type-id-4013' filepath='src/mongo/bson/bsonobj.h' line='52' column='1' id='type-id-4017'/>
+      <typedef-decl name='BSONElementMSet' type-id='type-id-4012' filepath='src/mongo/bson/bsonobj.h' line='53' column='1' id='type-id-4018'/>
       <namespace-decl name='repl'>
-        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3538'>
+        <class-decl name='ScatterGatherRunner' size-in-bits='768' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='49' column='1' id='type-id-3529'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_algorithm' type-id='type-id-3452' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
+            <var-decl name='_algorithm' type-id='type-id-3478' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
-            <var-decl name='_onCompletion' type-id='type-id-1133' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='117' column='1'/>
+            <var-decl name='_onCompletion' type-id='type-id-1145' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='117' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='320'>
-            <var-decl name='_sufficientResponsesReceived' type-id='type-id-402' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='118' column='1'/>
+            <var-decl name='_sufficientResponsesReceived' type-id='type-id-415' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='118' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='_callbacks' type-id='type-id-3646' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='119' column='1'/>
+            <var-decl name='_callbacks' type-id='type-id-3676' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='119' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='640'>
-            <var-decl name='_actualResponses' type-id='type-id-92' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='120' column='1'/>
+            <var-decl name='_actualResponses' type-id='type-id-97' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='120' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='704'>
             <var-decl name='_started' type-id='type-id-1' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='121' column='1'/>
           </data-member>
           <member-function access='private' constructor='yes'>
             <function-decl name='ScatterGatherRunner' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-3540'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-3570'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerC2EPNS0_22ScatterGatherAlgorithmE'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-3452'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-3478'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~ScatterGatherRunner' mangled-name='_ZN5mongo4repl19ScatterGatherRunnerD2Ev' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='60' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunnerD2Ev'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='run' mangled-name='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner3runEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
-              <return type-id='type-id-354'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-1511'/>
+              <return type-id='type-id-367'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='start' mangled-name='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner5startEPNS0_19ReplicationExecutorERKSt8functionIFvvEE'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
-              <parameter type-id='type-id-1135'/>
-              <return type-id='type-id-365'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-1511'/>
+              <parameter type-id='type-id-1147'/>
+              <return type-id='type-id-378'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='_signalSufficientResponsesReceived' mangled-name='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner34_signalSufficientResponsesReceivedEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-1511'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='_processResponse' mangled-name='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner16_processResponseERKNS_8executor12TaskExecutor25RemoteCommandCallbackArgsEPS1_'>
-              <parameter type-id='type-id-408'/>
-              <parameter type-id='type-id-3671'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-421'/>
+              <parameter type-id='type-id-3701'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='cancel' mangled-name='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl19ScatterGatherRunner6cancelEPNS0_19ReplicationExecutorE'>
-              <parameter type-id='type-id-3671' is-artificial='yes'/>
-              <parameter type-id='type-id-1498'/>
-              <return type-id='type-id-2675'/>
+              <parameter type-id='type-id-3701' is-artificial='yes'/>
+              <parameter type-id='type-id-1511'/>
+              <return type-id='type-id-2697'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='executor'>
-        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-3848'>
+        <class-decl name='TaskExecutor' visibility='default' is-declaration-only='yes' id='type-id-3881'>
           <member-type access='private'>
-            <class-decl name='CallbackState' visibility='default' is-declaration-only='yes' id='type-id-3849'/>
+            <class-decl name='CallbackState' visibility='default' is-declaration-only='yes' id='type-id-3882'/>
           </member-type>
           <member-type access='private'>
-            <class-decl name='EventState' visibility='default' is-declaration-only='yes' id='type-id-3851'/>
+            <class-decl name='EventState' visibility='default' is-declaration-only='yes' id='type-id-3884'/>
           </member-type>
         </class-decl>
       </namespace-decl>
       <function-decl name='fassert' mangled-name='_ZN5mongo7fassertEiRKNS_6StatusE' filepath='src/mongo/util/assert_util.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7fassertEiRKNS_6StatusE'>
         <parameter type-id='type-id-40' name='msgid' filepath='src/mongo/util/assert_util.h' line='229' column='1'/>
-        <parameter type-id='type-id-356' name='status' filepath='src/mongo/util/assert_util.h' line='229' column='1'/>
-        <return type-id='type-id-2675'/>
+        <parameter type-id='type-id-369' name='status' filepath='src/mongo/util/assert_util.h' line='229' column='1'/>
+        <return type-id='type-id-2697'/>
       </function-decl>
       <function-decl name='MakeGuard&lt;void, mongo::repl::ScatterGatherRunner, mongo::repl::ScatterGatherRunner, mongo::repl::ReplicationExecutor *, mongo::repl::ReplicationExecutor *&gt;' mangled-name='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_' filepath='src/mongo/util/scopeguard.h' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo9MakeGuardIvNS_4repl19ScatterGatherRunnerES2_PNS1_19ReplicationExecutorES4_EENS_18ObjScopeGuardImpl1IT0_MT1_FT_T2_ET3_EESB_PS6_SC_'>
-        <parameter type-id='type-id-3671' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
-        <parameter type-id='type-id-1498' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
-        <return type-id='type-id-3659'/>
+        <parameter type-id='type-id-3530' name='memFun' filepath='src/mongo/util/scopeguard.h' line='312' column='1'/>
+        <parameter type-id='type-id-3701' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
+        <parameter type-id='type-id-1511' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
+        <return type-id='type-id-3689'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='boost'>
-      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3985'>
+      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-4019'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-159' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3514'/>
+          <typedef-decl name='type' type-id='type-id-172' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-3545'/>
         </member-type>
       </class-decl>
+      <namespace-decl name='detail'>
+        <class-decl name='none_helper' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-4020'/>
+      </namespace-decl>
       <function-decl name='move&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZN5boost4moveIRNS_8optionalIN5mongo8executor12TaskExecutor11EventHandleEEEEEONS_16remove_referenceIT_E4typeEOS9_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRNS_8optionalIN5mongo8executor12TaskExecutor11EventHandleEEEEEONS_16remove_referenceIT_E4typeEOS9_'>
-        <parameter type-id='type-id-160' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-3515'/>
+        <parameter type-id='type-id-173' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
+        <return type-id='type-id-3546'/>
       </function-decl>
     </namespace-decl>
     <namespace-decl name='mpl_'>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-3811'>
-      <parameter type-id='type-id-394'/>
-      <parameter type-id='type-id-3671'/>
-      <parameter type-id='type-id-1451'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-3843'>
+      <parameter type-id='type-id-407'/>
+      <parameter type-id='type-id-3701'/>
+      <parameter type-id='type-id-1464'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-3849'>
+      <parameter type-id='type-id-421'/>
+      <parameter type-id='type-id-3701'/>
+      <return type-id='type-id-2697'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-3526'>
+      <parameter type-id='type-id-1511' is-artificial='yes'/>
+      <parameter type-id='type-id-413'/>
+      <return type-id='type-id-2697'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3817'>
-      <parameter type-id='type-id-408'/>
-      <parameter type-id='type-id-3671'/>
-      <return type-id='type-id-2675'/>
+    <function-type size-in-bits='64' id='type-id-3528'>
+      <parameter type-id='type-id-3701' is-artificial='yes'/>
+      <parameter type-id='type-id-1511'/>
+      <return type-id='type-id-2697'/>
     </function-type>
   </abi-instr>
 </abi-corpus>
diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index ff5d39d0..47807847 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1200,6 +1200,81 @@ InOutSpec in_out_specs[] =
     "data/test-abidiff-exit/PR31045/zfs-abigail-2.4/test-PR31045-report-1.txt",
     "output/test-abidiff-exit/PR31045/zfs-abigail-2.4/test-PR31045-report-1.txt"
   },
+  {
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v0.o",
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt",
+    "output/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr1-output-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v0.o",
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt",
+    "output/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr2-output-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v0.o",
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt",
+    "output/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr3-output-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v0.o",
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_ABI_CHANGE,
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt",
+    "output/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr4-output-1.txt"
+  },
+  {
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v0.o",
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-v1.o",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "--no-default-suppression",
+    abigail::tools_utils::ABIDIFF_OK,
+    "data/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt",
+    "output/test-abidiff-exit/pointer-to-member/test-ptr-to-mbr5-output-1.txt"
+  },
 #ifdef WITH_BTF
   {
     "data/test-abidiff-exit/btf/test0-v0.o",
diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc
index f01fe6db..cb9c8af6 100644
--- a/tests/test-annotate.cc
+++ b/tests/test-annotate.cc
@@ -136,6 +136,11 @@ InOutSpec in_out_specs[] =
     "data/test-annotate/PR29443-missing-xx.o.annotated.abi",
     "output/test-annotate/PR29443-missing-xx.o.annotated.abi",
   },
+  {
+    "data/test-read-dwarf/test-pointer-to-member-1.o",
+    "data/test-annotate/test-pointer-to-member-1.o.annotated.abi",
+    "output/test-annotate/test-pointer-to-member-1.o.annotated.abi",
+  },
   // This should be the last entry.
   {NULL, NULL, NULL}
 };
diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc
index d2d2ec6d..8570d774 100644
--- a/tests/test-read-dwarf.cc
+++ b/tests/test-read-dwarf.cc
@@ -559,6 +559,15 @@ static InOutSpec in_out_specs[] =
     "output/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi",
     NULL,
   },
+  {
+    "data/test-read-dwarf/test-pointer-to-member-1.o",
+    "",
+    "",
+    SEQUENCE_TYPE_ID_STYLE,
+    "data/test-read-dwarf/test-pointer-to-member-1.o.abi",
+    "output/test-read-dwarf/test-pointer-to-member-1.o.abi",
+    NULL,
+  },
   // DWARF fallback feature.
   {
     "data/test-read-dwarf/test-fallback.o",
-- 
2.39.3



-- 
		Dodji


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 3/4, applied] Bump abixml version to 2.3
  2023-12-01 15:51 [PATCH 0/4] Support C++ pointer-to-member types Dodji Seketeli
  2023-12-01 15:54 ` [PATCH 1/4, applied] Improve type naming Dodji Seketeli
  2023-12-01 15:54 ` [PATCH 2/4, applied] Bug 30260 - Support pointer-to-member type Dodji Seketeli
@ 2023-12-01 15:55 ` Dodji Seketeli
  2023-12-01 15:57 ` [PATCH 4/4, applied] Bump LIBABIGAIL_SO_CURRENT version to 4 Dodji Seketeli
  3 siblings, 0 replies; 5+ messages in thread
From: Dodji Seketeli @ 2023-12-01 15:55 UTC (permalink / raw)
  To: Dodji Seketeli; +Cc: libabigail

Hello,

An older version of libabigail won't be able to grok new abixml files
containing the recently added support for pointer-to-member types.

It's thus needed to bump the minor version number of the abixml
format.  The new version is thus 2.3.  As a result, this patch also
updates the version numbers shown in the various abixml files of the
test suite.

	* configure.ac: Bump ABIXML_VERSION_MINOR to 3.
	* tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi:
	Adjust.
	* tests/data/test-annotate/libtest23.so.abi: Likewise
	* tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Likewise
	* tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise
	* tests/data/test-annotate/test-anonymous-members-0.o.abi:
	Likewise
	* tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi:
	Likewise
	* tests/data/test-annotate/test0.abi: Likewise
	* tests/data/test-annotate/test1.abi: 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/test2.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/test3.so.abi: Likewise
	* tests/data/test-annotate/test4.so.abi: Likewise
	* tests/data/test-annotate/test5.o.abi: Likewise
	* tests/data/test-annotate/test6.so.abi: Likewise
	* tests/data/test-annotate/test7.so.abi: Likewise
	* tests/data/test-annotate/test8-qualified-this-pointer.so.abi:
	Likewise
	* tests/data/test-read-btf/test0.o.abi: Likewise
	* tests/data/test-read-btf/test1.o.abi: Likewise
	* tests/data/test-read-ctf/PR27700/test-PR27700.abi: Likewise
	* tests/data/test-read-ctf/test-PR26568-1.o.abi: Likewise
	* tests/data/test-read-ctf/test-PR26568-2.o.abi: Likewise
	* tests/data/test-read-ctf/test-alias.o.abi: Likewise
	* tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi:
	Likewise
	* tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi:
	Likewise
	* tests/data/test-read-ctf/test-anonymous-fields.o.abi: Likewise
	* tests/data/test-read-ctf/test-array-mdimension.abi: Likewise
	* tests/data/test-read-ctf/test-array-of-pointers.abi: Likewise
	* tests/data/test-read-ctf/test-array-size.abi: Likewise
	* tests/data/test-read-ctf/test-bitfield-enum.abi: Likewise
	* tests/data/test-read-ctf/test-bitfield.abi: Likewise
	* tests/data/test-read-ctf/test-callback.abi: Likewise
	* tests/data/test-read-ctf/test-callback2.abi: Likewise
	* tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi:
	Likewise
	* tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi:
	Likewise
	* tests/data/test-read-ctf/test-const-array.abi: Likewise
	* tests/data/test-read-ctf/test-dynamic-array.o.abi: Likewise
	* tests/data/test-read-ctf/test-enum-many.o.hash.abi: Likewise
	* tests/data/test-read-ctf/test-enum-symbol.o.hash.abi: Likewise
	* tests/data/test-read-ctf/test-enum.o.abi: Likewise
	* tests/data/test-read-ctf/test-fallback.abi: Likewise
	* tests/data/test-read-ctf/test-forward-type-decl.abi: Likewise
	* tests/data/test-read-ctf/test-functions-declaration.abi:
	Likewise
	* tests/data/test-read-ctf/test-linux-module.abi: Likewise
	* tests/data/test-read-ctf/test-list-struct.abi: Likewise
	* tests/data/test-read-ctf/test0.abi: Likewise
	* tests/data/test-read-ctf/test0.hash.abi: Likewise
	* tests/data/test-read-ctf/test1.so.abi: Likewise
	* tests/data/test-read-ctf/test1.so.hash.abi: Likewise
	* tests/data/test-read-ctf/test2.so.abi: Likewise
	* tests/data/test-read-ctf/test2.so.hash.abi: Likewise
	* tests/data/test-read-ctf/test3.so.abi: Likewise
	* tests/data/test-read-ctf/test3.so.hash.abi: Likewise
	* tests/data/test-read-ctf/test4.so.abi: Likewise
	* tests/data/test-read-ctf/test4.so.hash.abi: Likewise
	* tests/data/test-read-ctf/test5.o.abi: Likewise
	* tests/data/test-read-ctf/test7.o.abi: Likewise
	* tests/data/test-read-ctf/test8.o.abi: Likewise
	* tests/data/test-read-ctf/test9.o.abi: Likewise
	* tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi:
	Likewise
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise
	* tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi: Likewise
	* tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Likewise
	* tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi:
	Likewise
	* tests/data/test-read-dwarf/PR26261/PR26261-exe.abi: Likewise
	* tests/data/test-read-dwarf/PR27700/test-PR27700.abi: Likewise
	* tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi:
	Likewise
	* tests/data/test-read-dwarf/PR29443-missing-xx.o.abi: Likewise
	* tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi:
	Likewise
	* tests/data/test-read-dwarf/libtest23.so.abi: Likewise
	* tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi: Likewise
	* tests/data/test-read-dwarf/libtest24-drop-fns.so.abi: Likewise
	* tests/data/test-read-dwarf/test-PR26568-1.o.abi: Likewise
	* tests/data/test-read-dwarf/test-PR26568-2.o.abi: Likewise
	* tests/data/test-read-dwarf/test-fallback.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/test-pointer-to-member-1.o.abi:
	Likewise
	* tests/data/test-read-dwarf/test-suppressed-alias.o.abi: Likewise
	* tests/data/test-read-dwarf/test0.abi: Likewise
	* tests/data/test-read-dwarf/test0.hash.abi: Likewise
	* tests/data/test-read-dwarf/test1.abi: Likewise
	* tests/data/test-read-dwarf/test1.hash.abi: Likewise
	* tests/data/test-read-dwarf/test10-pr18818-gcc.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/test18-pr19037-libvtkRenderingLIC-6.1.so.abi:
	Likewise
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise
	* tests/data/test-read-dwarf/test2.so.abi: Likewise
	* tests/data/test-read-dwarf/test2.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.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/test3-alias-1.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test3-alias-2.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test3-alias-3.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test3-alias-4.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test3.so.abi: Likewise
	* tests/data/test-read-dwarf/test3.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test4.so.abi: Likewise
	* tests/data/test-read-dwarf/test4.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test5.o.abi: Likewise
	* tests/data/test-read-dwarf/test5.o.hash.abi: Likewise
	* tests/data/test-read-dwarf/test6.so.abi: Likewise
	* tests/data/test-read-dwarf/test6.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test7.so.abi: Likewise
	* tests/data/test-read-dwarf/test7.so.hash.abi: Likewise
	* tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi:
	Likewise
	* tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi:
	Likewise
	* tests/data/test-read-dwarf/test9-pr18818-clang.so.abi: Likewise
	* tests/data/test-read-write/test-crc.xml: Likewise
	* tests/data/test-read-write/test26.xml: Likewise
	* tests/data/test-read-write/test27.xml: Likewise
	* tests/data/test-read-write/test28-without-std-fns-ref.xml:
	Likewise
	* tests/data/test-read-write/test28-without-std-vars-ref.xml:
	Likewise

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 configure.ac                                  |   2 +-
 .../PR29443-missing-xx.o.annotated.abi        |   2 +-
 tests/data/test-annotate/libtest23.so.abi     |   2 +-
 .../test-annotate/libtest24-drop-fns-2.so.abi |   2 +-
 .../test-annotate/libtest24-drop-fns.so.abi   |   2 +-
 .../test-anonymous-members-0.o.abi            |   2 +-
 .../test-pointer-to-member-1.o.annotated.abi  |   2 +-
 tests/data/test-annotate/test0.abi            |   2 +-
 tests/data/test-annotate/test1.abi            |   2 +-
 .../data/test-annotate/test13-pr18894.so.abi  |   2 +-
 .../data/test-annotate/test14-pr18893.so.abi  | 146 ++--
 .../data/test-annotate/test15-pr18892.so.abi  |   2 +-
 .../data/test-annotate/test17-pr19027.so.abi  | 152 ++--
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   2 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi | 668 +++++++++---------
 tests/data/test-annotate/test2.so.abi         |   2 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |   2 +-
 .../data/test-annotate/test21-pr19092.so.abi  |   2 +-
 tests/data/test-annotate/test3.so.abi         |   2 +-
 tests/data/test-annotate/test4.so.abi         |   2 +-
 tests/data/test-annotate/test5.o.abi          |   2 +-
 tests/data/test-annotate/test6.so.abi         |   2 +-
 tests/data/test-annotate/test7.so.abi         |   2 +-
 .../test8-qualified-this-pointer.so.abi       |   2 +-
 tests/data/test-read-btf/test0.o.abi          |   2 +-
 tests/data/test-read-btf/test1.o.abi          |   2 +-
 .../test-read-ctf/PR27700/test-PR27700.abi    |   2 +-
 tests/data/test-read-ctf/test-PR26568-1.o.abi |   2 +-
 tests/data/test-read-ctf/test-PR26568-2.o.abi |   2 +-
 tests/data/test-read-ctf/test-alias.o.abi     |   2 +-
 .../test-ambiguous-struct-A.o.hash.abi        |   2 +-
 .../test-ambiguous-struct-B.o.hash.abi        |   2 +-
 .../test-read-ctf/test-anonymous-fields.o.abi |   2 +-
 .../test-read-ctf/test-array-mdimension.abi   |   2 +-
 .../test-read-ctf/test-array-of-pointers.abi  |   2 +-
 tests/data/test-read-ctf/test-array-size.abi  |   2 +-
 .../data/test-read-ctf/test-bitfield-enum.abi |   2 +-
 tests/data/test-read-ctf/test-bitfield.abi    |   2 +-
 tests/data/test-read-ctf/test-callback.abi    |   2 +-
 tests/data/test-read-ctf/test-callback2.abi   |   2 +-
 .../test-conflicting-type-syms-a.o.hash.abi   |   2 +-
 .../test-conflicting-type-syms-b.o.hash.abi   |   2 +-
 tests/data/test-read-ctf/test-const-array.abi |   2 +-
 .../test-read-ctf/test-dynamic-array.o.abi    |   2 +-
 .../test-read-ctf/test-enum-many.o.hash.abi   |   2 +-
 .../test-read-ctf/test-enum-symbol.o.hash.abi |   2 +-
 tests/data/test-read-ctf/test-enum.o.abi      |   2 +-
 tests/data/test-read-ctf/test-fallback.abi    |   2 +-
 .../test-read-ctf/test-forward-type-decl.abi  |   2 +-
 .../test-functions-declaration.abi            |   2 +-
 .../data/test-read-ctf/test-linux-module.abi  |   2 +-
 tests/data/test-read-ctf/test-list-struct.abi |   2 +-
 tests/data/test-read-ctf/test0.abi            |   2 +-
 tests/data/test-read-ctf/test0.hash.abi       |   2 +-
 tests/data/test-read-ctf/test1.so.abi         |   2 +-
 tests/data/test-read-ctf/test1.so.hash.abi    |   2 +-
 tests/data/test-read-ctf/test2.so.abi         |   2 +-
 tests/data/test-read-ctf/test2.so.hash.abi    |   2 +-
 tests/data/test-read-ctf/test3.so.abi         |   2 +-
 tests/data/test-read-ctf/test3.so.hash.abi    |   2 +-
 tests/data/test-read-ctf/test4.so.abi         |   2 +-
 tests/data/test-read-ctf/test4.so.hash.abi    |   2 +-
 tests/data/test-read-ctf/test5.o.abi          |   2 +-
 tests/data/test-read-ctf/test7.o.abi          |   2 +-
 tests/data/test-read-ctf/test8.o.abi          |   2 +-
 tests/data/test-read-ctf/test9.o.abi          |   2 +-
 .../PR22015-libboost_iostreams.so.abi         |   2 +-
 .../test-read-dwarf/PR22122-libftdc.so.abi    |   2 +-
 .../PR24378-fn-is-not-scope.abi               |   2 +-
 .../data/test-read-dwarf/PR25007-sdhci.ko.abi |   2 +-
 .../PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi |   2 +-
 .../test-read-dwarf/PR26261/PR26261-exe.abi   |   2 +-
 .../test-read-dwarf/PR27700/test-PR27700.abi  |   2 +-
 .../PR28584/PR28584-smv.clang.o.abi           |   2 +-
 .../test-read-dwarf/PR29443-missing-xx.o.abi  |   2 +-
 .../PR29692-kdelibs3-libkjava.so.1.0.0.abi    |   2 +-
 tests/data/test-read-dwarf/libtest23.so.abi   |   2 +-
 .../libtest24-drop-fns-2.so.abi               |   2 +-
 .../test-read-dwarf/libtest24-drop-fns.so.abi |   2 +-
 .../data/test-read-dwarf/test-PR26568-1.o.abi |   2 +-
 .../data/test-read-dwarf/test-PR26568-2.o.abi |   2 +-
 tests/data/test-read-dwarf/test-fallback.abi  |   2 +-
 .../test-read-dwarf/test-libaaudio.so.abi     |   2 +-
 .../test-read-dwarf/test-libandroid.so.abi    |   2 +-
 .../test-pointer-to-member-1.o.abi            |   2 +-
 .../test-suppressed-alias.o.abi               |   2 +-
 tests/data/test-read-dwarf/test0.abi          |   2 +-
 tests/data/test-read-dwarf/test0.hash.abi     |   2 +-
 tests/data/test-read-dwarf/test1.abi          |   2 +-
 tests/data/test-read-dwarf/test1.hash.abi     |   2 +-
 .../test-read-dwarf/test10-pr18818-gcc.so.abi |   2 +-
 .../test-read-dwarf/test11-pr18828.so.abi     |   2 +-
 .../test-read-dwarf/test12-pr18844.so.abi     |   2 +-
 .../test-read-dwarf/test13-pr18894.so.abi     |   2 +-
 .../test-read-dwarf/test14-pr18893.so.abi     |   2 +-
 .../test-read-dwarf/test15-pr18892.so.abi     |   2 +-
 .../test-read-dwarf/test16-pr18904.so.abi     |   2 +-
 .../test-read-dwarf/test17-pr19027.so.abi     |   2 +-
 ...st18-pr19037-libvtkRenderingLIC-6.1.so.abi |   2 +-
 ...19-pr19023-libtcmalloc_and_profiler.so.abi |   2 +-
 tests/data/test-read-dwarf/test2.so.abi       |   2 +-
 tests/data/test-read-dwarf/test2.so.hash.abi  |   2 +-
 ...st20-pr19025-libvtkParallelCore-6.1.so.abi |   2 +-
 .../test-read-dwarf/test21-pr19092.so.abi     |   2 +-
 .../test22-pr19097-libstdc++.so.6.0.17.so.abi |   2 +-
 .../test-read-dwarf/test3-alias-1.so.hash.abi |   2 +-
 .../test-read-dwarf/test3-alias-2.so.hash.abi |   2 +-
 .../test-read-dwarf/test3-alias-3.so.hash.abi |   2 +-
 .../test-read-dwarf/test3-alias-4.so.hash.abi |   2 +-
 tests/data/test-read-dwarf/test3.so.abi       |   2 +-
 tests/data/test-read-dwarf/test3.so.hash.abi  |   2 +-
 tests/data/test-read-dwarf/test4.so.abi       |   2 +-
 tests/data/test-read-dwarf/test4.so.hash.abi  |   2 +-
 tests/data/test-read-dwarf/test5.o.abi        |   2 +-
 tests/data/test-read-dwarf/test5.o.hash.abi   |   2 +-
 tests/data/test-read-dwarf/test6.so.abi       |   2 +-
 tests/data/test-read-dwarf/test6.so.hash.abi  |   2 +-
 tests/data/test-read-dwarf/test7.so.abi       |   2 +-
 tests/data/test-read-dwarf/test7.so.hash.abi  |   2 +-
 .../test8-qualified-this-pointer.so.abi       |   2 +-
 .../test8-qualified-this-pointer.so.hash.abi  |   2 +-
 .../test9-pr18818-clang.so.abi                |   2 +-
 tests/data/test-read-write/test-crc.xml       |   2 +-
 tests/data/test-read-write/test26.xml         |   2 +-
 tests/data/test-read-write/test27.xml         |   2 +-
 .../test28-without-std-fns-ref.xml            |   2 +-
 .../test28-without-std-vars-ref.xml           |   2 +-
 127 files changed, 607 insertions(+), 607 deletions(-)

diff --git a/configure.ac b/configure.ac
index 15633bf2..2da4d152 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ dnl The minor version number of the abixml version should be changed
 dnl each time and old version of libabigail can't handle a new version
 dnl of abixml.  Note however that when the major version number is
 dnl changed, the minor version number should be set to zero.
-ABIXML_VERSION_MINOR=2
+ABIXML_VERSION_MINOR=3
 LIBABIGAIL_SO_CURRENT=libabigail_so_current
 LIBABIGAIL_SO_REVISION=libabigail_so_revision
 LIBABIGAIL_SO_AGE=libabigail_so_age
diff --git a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
index 506ba75b..081084c7 100644
--- a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
+++ b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <!-- signed char -->
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi
index 6ca5c79d..70220c37 100644
--- a/tests/data/test-annotate/libtest23.so.abi
+++ b/tests/data/test-annotate/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
index c813b9ba..ea1a1dd8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi
index c813b9ba..ea1a1dd8 100644
--- a/tests/data/test-annotate/libtest24-drop-fns.so.abi
+++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi
index d75e67ee..f6052484 100644
--- a/tests/data/test-annotate/test-anonymous-members-0.o.abi
+++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- foo(S&) -->
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
index 02e54955..dc347f04 100644
--- a/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
+++ b/tests/data/test-annotate/test-pointer-to-member-1.o.annotated.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- main -->
     <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi
index 8ce539d9..d823a674 100644
--- a/tests/data/test-annotate/test0.abi
+++ b/tests/data/test-annotate/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi
index e1e449a7..a777f536 100644
--- a/tests/data/test-annotate/test1.abi
+++ b/tests/data/test-annotate/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi
index 850b1255..5ca7521f 100644
--- a/tests/data/test-annotate/test13-pr18894.so.abi
+++ b/tests/data/test-annotate/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libdbus-1.so.3'>
+<abi-corpus version='2.3' soname='libdbus-1.so.3'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi
index e7f0e2c6..2eda9a97 100644
--- a/tests/data/test-annotate/test14-pr18893.so.abi
+++ b/tests/data/test-annotate/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libGLU.so.1'>
+<abi-corpus version='2.3' soname='libGLU.so.1'>
   <elf-needed>
     <dependency name='libGL.so.1'/>
     <dependency name='libstdc++.so.6'/>
@@ -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(*OpenGLCurveEvaluator::beginCallBackN)(GLenum) -->
+        <!-- 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) -->
+        <!-- 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(*OpenGLCurveEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLCurveEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLCurveEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLCurveEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLCurveEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- 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(*OpenGLCurveEvaluator::endCallBackData)(void*) -->
+        <!-- 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(*OpenGLCurveEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLCurveEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLCurveEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLCurveEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- 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'/>
@@ -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(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
+        <!-- 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) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- 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'>
@@ -2252,7 +2252,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void(*)(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] -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-51'/>
@@ -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(*OpenGLSurfaceEvaluator::beginCallBackN)(GLenum) -->
+        <!-- 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) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::vertexCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::normalCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::colorCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::texcoordCallBackN)(const GLfloat*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::beginCallBackData)(GLenum, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::endCallBackData)(void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::vertexCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::normalCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::colorCallBackData)(const GLfloat*, void*) -->
+        <!-- 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(*OpenGLSurfaceEvaluator::texcoordCallBackData)(const GLfloat*, void*) -->
+        <!-- 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'>
@@ -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(*PFVS::__pfn)(NurbsTessellator*, void*) -->
+        <!-- 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'>
@@ -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(*DictList::leq)(void*, DictListKey, DictListKey) -->
+        <!-- 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(*GLUtesselator::callError)(GLenum) -->
+        <!-- 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(*GLUtesselator::callCombine)(GLdouble*, void**, GLfloat*, void**) -->
+        <!-- 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(*GLUtesselator::callBegin)(GLenum) -->
+        <!-- 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(*GLUtesselator::callEdgeFlag)(GLboolean) -->
+        <!-- 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(*GLUtesselator::callVertex)(void*) -->
+        <!-- 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) -->
+        <!-- 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(*GLUtesselator::callMesh)(GLUmesh*) -->
+        <!-- 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(*GLUtesselator::callBeginData)(GLenum, void*) -->
+        <!-- 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(*GLUtesselator::callEdgeFlagData)(GLboolean, void*) -->
+        <!-- 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(*GLUtesselator::callVertexData)(void*, void*) -->
+        <!-- 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(*GLUtesselator::callEndData)(void*) -->
+        <!-- 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(*GLUtesselator::callErrorData)(GLenum, void*) -->
+        <!-- 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(*GLUtesselator::callCombineData)(GLdouble*, void**, GLfloat*, void**, void*) -->
+        <!-- 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(*PriorityQHeap::leq)(PQHeapKey, PQHeapKey) -->
+        <!-- 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(*PriorityQSort::leq)(PQSortKey, PQSortKey) -->
+        <!-- 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(*)(PQHeapKey, PQHeapKey) -->
+    <!-- int (*)(PQHeapKey, PQHeapKey) -->
     <pointer-type-def type-id='type-id-433' size-in-bits='64' id='type-id-416'/>
-    <!-- int(*)(void*, DictListKey, 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(*)(GLboolean) -->
+    <!-- void (*)(GLboolean) -->
     <pointer-type-def type-id='type-id-436' size-in-bits='64' id='type-id-400'/>
-    <!-- void(*)(GLboolean, void*) -->
+    <!-- void (*)(GLboolean, void*) -->
     <pointer-type-def type-id='type-id-437' size-in-bits='64' id='type-id-402'/>
-    <!-- void(*)(GLdouble*, void**, GLfloat*, void**) -->
+    <!-- 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*) -->
+    <!-- void (*)(GLdouble*, void**, GLfloat*, void**, void*) -->
     <pointer-type-def type-id='type-id-439' size-in-bits='64' id='type-id-404'/>
-    <!-- void(*)(GLenum) -->
+    <!-- void (*)(GLenum) -->
     <pointer-type-def type-id='type-id-39' size-in-bits='64' id='type-id-11'/>
-    <!-- void(*)(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'/>
@@ -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(*GLUquadric::errorCallback)(GLint) -->
+        <!-- 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,13 +23378,13 @@
     <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(*)(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(*)(GLint) -->
+    <!-- void (*)(GLint) -->
     <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-455'/>
-    <!-- void(*)(void) -->
+    <!-- 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'>
diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index 65e69956..409f9efa 100644
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtsan.so.0'>
+<abi-corpus version='2.3' soname='libtsan.so.0'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index 98d5282e..f14fb4dc 100644
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.3' soname='libharfbuzz.so.0'>
   <elf-needed>
     <dependency name='libglib-2.0.so.0'/>
     <dependency name='libfreetype.so.6'/>
@@ -973,7 +973,7 @@
     <typedef-decl name='hb_blob_t' type-id='type-id-15' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.h' line='65' column='1' id='type-id-43'/>
     <!-- typedef int hb_bool_t -->
     <typedef-decl name='hb_bool_t' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='73' column='1' id='type-id-40'/>
-    <!-- typedef void(*)(void*) hb_destroy_func_t -->
+    <!-- typedef void (*)(void*) hb_destroy_func_t -->
     <typedef-decl name='hb_destroy_func_t' type-id='type-id-44' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='339' column='1' id='type-id-20'/>
     <!-- typedef pthread_mutex_t hb_mutex_impl_t -->
     <typedef-decl name='hb_mutex_impl_t' type-id='type-id-45' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-mutex-private.hh' line='59' column='1' id='type-id-29'/>
@@ -1085,7 +1085,7 @@
     <pointer-type-def type-id='type-id-46' size-in-bits='64' id='type-id-26'/>
     <!-- unsigned int* -->
     <pointer-type-def type-id='type-id-18' size-in-bits='64' id='type-id-60'/>
-    <!-- void(*)(void*) -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-44'/>
     <!-- hb_blob_t* hb_blob_create(const char*, unsigned int, hb_memory_mode_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_blob_create' mangled-name='hb_blob_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.cc' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_blob_create'>
@@ -2395,23 +2395,23 @@
     <typedef-decl name='hb_position_t' type-id='type-id-126' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-103'/>
     <!-- typedef hb_segment_properties_t hb_segment_properties_t -->
     <typedef-decl name='hb_segment_properties_t' type-id='type-id-104' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-85'/>
-    <!-- typedef hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
+    <!-- typedef hb_unicode_combining_class_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_combining_class_func_t -->
     <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-127' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-109'/>
-    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_compose_func_t -->
     <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-128' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-114'/>
-    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
+    <!-- typedef unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) hb_unicode_decompose_compatibility_func_t -->
     <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-129' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-116'/>
-    <!-- typedef hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) hb_unicode_decompose_func_t -->
     <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-115'/>
-    <!-- typedef unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
+    <!-- typedef unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_eastasian_width_func_t -->
     <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-110'/>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
     <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-132'/>
-    <!-- typedef hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
+    <!-- typedef hb_unicode_general_category_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_general_category_func_t -->
     <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-111'/>
-    <!-- typedef hb_codepoint_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
+    <!-- typedef hb_codepoint_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_mirroring_func_t -->
     <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-112'/>
-    <!-- typedef hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
+    <!-- typedef hb_script_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) hb_unicode_script_func_t -->
     <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-113'/>
     <!-- typedef _hb_var_int_t hb_var_int_t -->
     <typedef-decl name='hb_var_int_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-101'/>
@@ -2502,9 +2502,9 @@
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-149'/>
     <!-- const unsigned int -->
     <qualified-type-def type-id='type-id-18' const='yes' id='type-id-89'/>
-    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-130'/>
-    <!-- hb_bool_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-128'/>
     <!-- hb_buffer_t* -->
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-91'/>
@@ -2524,19 +2524,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-124' size-in-bits='64' id='type-id-98'/>
     <!-- hb_glyph_position_t* -->
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-87'/>
-    <!-- hb_script_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_script_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-134'/>
-    <!-- hb_unicode_combining_class_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_unicode_combining_class_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-127'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-118'/>
     <!-- hb_unicode_funcs_t* -->
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-84'/>
-    <!-- hb_unicode_general_category_t(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- hb_unicode_general_category_t (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-133'/>
-    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-129'/>
-    <!-- unsigned int(*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
+    <!-- unsigned int (*)(hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-158' size-in-bits='64' id='type-id-131'/>
     <!-- struct hb_font_t -->
     <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-121'>
@@ -4826,15 +4826,15 @@
     <typedef-decl name='hb_feature_t' type-id='type-id-198' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='48' column='1' id='type-id-219'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
     <typedef-decl name='hb_font_funcs_t' type-id='type-id-199' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-220'/>
-    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
+    <!-- typedef hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, void*) hb_font_get_glyph_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_advance_func_t' type-id='type-id-221' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='102' column='1' id='type-id-222'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_contour_point_func_t -->
     <typedef-decl name='hb_font_get_glyph_contour_point_func_t' type-id='type-id-223' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='127' column='1' id='type-id-210'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) hb_font_get_glyph_extents_func_t -->
     <typedef-decl name='hb_font_get_glyph_extents_func_t' type-id='type-id-224' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='123' column='1' id='type-id-209'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) hb_font_get_glyph_from_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_from_name_func_t' type-id='type-id-225' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='137' column='1' id='type-id-212'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) hb_font_get_glyph_func_t -->
     <typedef-decl name='hb_font_get_glyph_func_t' type-id='type-id-226' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='97' column='1' id='type-id-202'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='103' column='1' id='type-id-203'/>
@@ -4842,11 +4842,11 @@
     <typedef-decl name='hb_font_get_glyph_h_kerning_func_t' type-id='type-id-227' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='116' column='1' id='type-id-207'/>
     <!-- typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_h_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='110' column='1' id='type-id-205'/>
-    <!-- typedef hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
+    <!-- typedef hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) hb_font_get_glyph_kerning_func_t -->
     <typedef-decl name='hb_font_get_glyph_kerning_func_t' type-id='type-id-229' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='115' column='1' id='type-id-227'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) hb_font_get_glyph_name_func_t -->
     <typedef-decl name='hb_font_get_glyph_name_func_t' type-id='type-id-230' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='133' column='1' id='type-id-211'/>
-    <!-- typedef hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
+    <!-- typedef hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) hb_font_get_glyph_origin_func_t -->
     <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-231' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-228'/>
     <!-- typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t -->
     <typedef-decl name='hb_font_get_glyph_v_advance_func_t' type-id='type-id-222' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='104' column='1' id='type-id-204'/>
@@ -4856,7 +4856,7 @@
     <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-206'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
     <typedef-decl name='hb_glyph_extents_t' type-id='type-id-214' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-232'/>
-    <!-- typedef hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
+    <!-- typedef hb_blob_t* (*)(hb_face_t*, hb_tag_t, void*) hb_reference_table_func_t -->
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-233' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-196'/>
     <!-- typedef typedef hb_bool_t (hb_shape_plan_t*, hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) hb_shape_func_t -->
     <typedef-decl name='hb_shape_func_t' type-id='type-id-234' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-235'/>
@@ -5067,19 +5067,19 @@
     <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <!-- hb_auto_trace_t<0, bool>* -->
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <!-- hb_blob_t*(*)(hb_face_t*, hb_tag_t, void*) -->
+    <!-- hb_blob_t* (*)(hb_face_t*, hb_tag_t, void*) -->
     <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-233'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-225'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
     <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-230'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-226'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
     <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-224'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
     <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-231'/>
-    <!-- hb_bool_t(*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
+    <!-- hb_bool_t (*)(hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-223'/>
     <!-- hb_face_t* -->
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-160'/>
@@ -5093,9 +5093,9 @@
     <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-159'/>
     <!-- hb_glyph_extents_t* -->
     <pointer-type-def type-id='type-id-232' size-in-bits='64' id='type-id-164'/>
-    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
+    <!-- hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-229'/>
-    <!-- hb_position_t(*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
+    <!-- hb_position_t (*)(hb_font_t*, void*, hb_codepoint_t, void*) -->
     <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-221'/>
     <!-- hb_position_t* -->
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-163'/>
@@ -10262,7 +10262,7 @@
         <var-decl name='y' type-id='type-id-579' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <!-- typedef void*(*)(FT_Memory, long int) FT_Alloc_Func -->
+    <!-- typedef void* (*)(FT_Memory, long int) FT_Alloc_Func -->
     <typedef-decl name='FT_Alloc_Func' type-id='type-id-637' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='90' column='1' id='type-id-622'/>
     <!-- typedef FT_BBox_ FT_BBox -->
     <typedef-decl name='FT_BBox' type-id='type-id-578' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='120' column='1' id='type-id-595'/>
@@ -10278,11 +10278,11 @@
     <typedef-decl name='FT_Face' type-id='type-id-640' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='440' column='1' id='type-id-585'/>
     <!-- typedef long int FT_Fixed -->
     <typedef-decl name='FT_Fixed' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='284' column='1' id='type-id-610'/>
-    <!-- typedef void(*)(FT_Memory, void*) FT_Free_Func -->
+    <!-- typedef void (*)(FT_Memory, void*) FT_Free_Func -->
     <typedef-decl name='FT_Free_Func' type-id='type-id-641' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='111' column='1' id='type-id-623'/>
     <!-- typedef FT_Generic_ FT_Generic -->
     <typedef-decl name='FT_Generic' type-id='type-id-604' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='460' column='1' id='type-id-594'/>
-    <!-- typedef void(*)(void*) FT_Generic_Finalizer -->
+    <!-- typedef void (*)(void*) FT_Generic_Finalizer -->
     <typedef-decl name='FT_Generic_Finalizer' type-id='type-id-44' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='424' column='1' id='type-id-605'/>
     <!-- typedef FT_GlyphSlotRec_* FT_GlyphSlot -->
     <typedef-decl name='FT_GlyphSlot' type-id='type-id-642' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='492' column='1' id='type-id-596'/>
@@ -10304,7 +10304,7 @@
     <typedef-decl name='FT_Outline' type-id='type-id-625' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-614'/>
     <!-- typedef long int FT_Pos -->
     <typedef-decl name='FT_Pos' type-id='type-id-12' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-579'/>
-    <!-- typedef void*(*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
+    <!-- typedef void* (*)(FT_Memory, long int, long int, void*) FT_Realloc_Func -->
     <typedef-decl name='FT_Realloc_Func' type-id='type-id-645' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='146' column='1' id='type-id-624'/>
     <!-- typedef short int FT_Short -->
     <typedef-decl name='FT_Short' type-id='type-id-80' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-583'/>
@@ -10316,9 +10316,9 @@
     <typedef-decl name='FT_Stream' type-id='type-id-647' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='196' column='1' id='type-id-601'/>
     <!-- typedef FT_StreamDesc_ FT_StreamDesc -->
     <typedef-decl name='FT_StreamDesc' type-id='type-id-648' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='214' column='1' id='type-id-633'/>
-    <!-- typedef void(*)(FT_Stream) FT_Stream_CloseFunc -->
+    <!-- typedef void (*)(FT_Stream) FT_Stream_CloseFunc -->
     <typedef-decl name='FT_Stream_CloseFunc' type-id='type-id-649' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='268' column='1' id='type-id-635'/>
-    <!-- typedef unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
+    <!-- typedef unsigned long int (*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) FT_Stream_IoFunc -->
     <typedef-decl name='FT_Stream_IoFunc' type-id='type-id-650' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftsystem.h' line='251' column='1' id='type-id-634'/>
     <!-- typedef char FT_String -->
     <typedef-decl name='FT_String' type-id='type-id-2' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='183' column='1' id='type-id-651'/>
@@ -10365,15 +10365,15 @@
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-627'/>
     <!-- unsigned char* -->
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-581'/>
-    <!-- unsigned long int(*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
+    <!-- unsigned long int (*)(FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <pointer-type-def type-id='type-id-652' size-in-bits='64' id='type-id-650'/>
-    <!-- void(*)(FT_Memory, void*) -->
+    <!-- void (*)(FT_Memory, void*) -->
     <pointer-type-def type-id='type-id-653' size-in-bits='64' id='type-id-641'/>
-    <!-- void(*)(FT_Stream) -->
+    <!-- void (*)(FT_Stream) -->
     <pointer-type-def type-id='type-id-654' size-in-bits='64' id='type-id-649'/>
-    <!-- void*(*)(FT_Memory, long int) -->
+    <!-- void* (*)(FT_Memory, long int) -->
     <pointer-type-def type-id='type-id-655' size-in-bits='64' id='type-id-637'/>
-    <!-- void*(*)(FT_Memory, long int, long int, void*) -->
+    <!-- void* (*)(FT_Memory, long int, long int, void*) -->
     <pointer-type-def type-id='type-id-656' size-in-bits='64' id='type-id-645'/>
     <!-- FT_DriverRec_* -->
     <pointer-type-def type-id='type-id-657' size-in-bits='64' id='type-id-658'/>
@@ -13329,7 +13329,7 @@
         <!-- struct hb_ot_map_t::stage_map_t -->
         <class-decl name='stage_map_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='70' column='1' id='type-id-921'>
           <member-type access='public'>
-            <!-- typedef void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) hb_ot_map_t::stage_map_t::pause_func_t -->
+            <!-- typedef void (*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) hb_ot_map_t::stage_map_t::pause_func_t -->
             <typedef-decl name='pause_func_t' type-id='type-id-957' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='68' column='1' id='type-id-956'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
@@ -14644,7 +14644,7 @@
     <pointer-type-def type-id='type-id-1323' size-in-bits='64' id='type-id-1324'/>
     <!-- OT::hb_apply_context_t::matcher_t* -->
     <pointer-type-def type-id='type-id-1325' size-in-bits='64' id='type-id-1326'/>
-    <!-- OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) -->
+    <!-- OT::hb_apply_context_t::return_t (*)(OT::hb_apply_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1327' size-in-bits='64' id='type-id-1328'/>
     <!-- OT::hb_apply_context_t::skipping_backward_iterator_t* -->
     <pointer-type-def type-id='type-id-1329' size-in-bits='64' id='type-id-1330'/>
@@ -14652,19 +14652,19 @@
     <pointer-type-def type-id='type-id-1331' size-in-bits='64' id='type-id-1332'/>
     <!-- OT::hb_closure_context_t* -->
     <pointer-type-def type-id='type-id-1333' size-in-bits='64' id='type-id-1334'/>
-    <!-- OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) -->
+    <!-- OT::hb_closure_context_t::return_t (*)(OT::hb_closure_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1335' size-in-bits='64' id='type-id-1336'/>
     <!-- OT::hb_collect_glyphs_context_t* -->
     <pointer-type-def type-id='type-id-1337' size-in-bits='64' id='type-id-1338'/>
-    <!-- OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
+    <!-- OT::hb_collect_glyphs_context_t::return_t (*)(OT::hb_collect_glyphs_context_t*, unsigned int) -->
     <pointer-type-def type-id='type-id-1339' size-in-bits='64' id='type-id-1340'/>
     <!-- OT::hb_get_coverage_context_t* -->
     <pointer-type-def type-id='type-id-1341' size-in-bits='64' id='type-id-1342'/>
     <!-- OT::hb_would_apply_context_t* -->
     <pointer-type-def type-id='type-id-1343' size-in-bits='64' id='type-id-1344'/>
-    <!-- bool(*)(hb_codepoint_t, const OT::USHORT&, void*) -->
+    <!-- bool (*)(hb_codepoint_t, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1345' size-in-bits='64' id='type-id-1346'/>
-    <!-- bool(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <!-- bool (*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1347' size-in-bits='64' id='type-id-1348'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1349'/>
@@ -15714,9 +15714,9 @@
     <pointer-type-def type-id='type-id-982' size-in-bits='64' id='type-id-994'/>
     <!-- hb_set_digest_t* -->
     <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-1744'/>
-    <!-- void(*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
+    <!-- void (*)(const hb_ot_shape_plan_t*, hb_font_t*, hb_buffer_t*) -->
     <pointer-type-def type-id='type-id-1745' size-in-bits='64' id='type-id-957'/>
-    <!-- void(*)(hb_set_t*, const OT::USHORT&, void*) -->
+    <!-- void (*)(hb_set_t*, const OT::USHORT&, void*) -->
     <pointer-type-def type-id='type-id-1746' size-in-bits='64' id='type-id-1747'/>
     <reference-type-def kind='lvalue' type-id='type-id-1748' size-in-bits='64' id='type-id-1749'/>
     <reference-type-def kind='lvalue' type-id='type-id-1750' size-in-bits='64' id='type-id-1751'/>
@@ -27178,7 +27178,7 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <!-- typedef bool(*)(hb_codepoint_t, const OT::USHORT&, void*) OT::hb_apply_context_t::matcher_t::match_func_t -->
+              <!-- typedef bool (*)(hb_codepoint_t, const OT::USHORT&, void*) OT::hb_apply_context_t::matcher_t::match_func_t -->
               <typedef-decl name='match_func_t' type-id='type-id-1346' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='331' column='1' id='type-id-1837'/>
             </member-type>
             <data-member access='protected' layout-offset-in-bits='0'>
@@ -27515,7 +27515,7 @@
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <!-- typedef OT::hb_apply_context_t::return_t(*)(OT::hb_apply_context_t*, unsigned int) OT::hb_apply_context_t::recurse_func_t -->
+          <!-- typedef OT::hb_apply_context_t::return_t (*)(OT::hb_apply_context_t*, unsigned int) OT::hb_apply_context_t::recurse_func_t -->
           <typedef-decl name='recurse_func_t' type-id='type-id-1328' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='266' column='1' id='type-id-1889'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -28029,7 +28029,7 @@
       <!-- struct OT::hb_closure_context_t -->
       <class-decl name='hb_closure_context_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='56' column='1' id='type-id-1333'>
         <member-type access='public'>
-          <!-- typedef OT::hb_closure_context_t::return_t(*)(OT::hb_closure_context_t*, unsigned int) OT::hb_closure_context_t::recurse_func_t -->
+          <!-- typedef OT::hb_closure_context_t::return_t (*)(OT::hb_closure_context_t*, unsigned int) OT::hb_closure_context_t::recurse_func_t -->
           <typedef-decl name='recurse_func_t' type-id='type-id-1336' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='60' column='1' id='type-id-1891'/>
         </member-type>
         <member-type access='public'>
@@ -28260,7 +28260,7 @@
       <!-- struct OT::hb_collect_glyphs_context_t -->
       <class-decl name='hb_collect_glyphs_context_t' size-in-bits='66944' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='144' column='1' id='type-id-1337'>
         <member-type access='public'>
-          <!-- typedef OT::hb_collect_glyphs_context_t::return_t(*)(OT::hb_collect_glyphs_context_t*, unsigned int) OT::hb_collect_glyphs_context_t::recurse_func_t -->
+          <!-- typedef OT::hb_collect_glyphs_context_t::return_t (*)(OT::hb_collect_glyphs_context_t*, unsigned int) OT::hb_collect_glyphs_context_t::recurse_func_t -->
           <typedef-decl name='recurse_func_t' type-id='type-id-1340' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='148' column='1' id='type-id-1892'/>
         </member-type>
         <data-member access='public' static='yes'>
@@ -29213,9 +29213,9 @@
       <typedef-decl name='Value' type-id='type-id-371' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='45' column='1' id='type-id-912'/>
       <!-- typedef Value[1] OT::ValueRecord -->
       <typedef-decl name='ValueRecord' type-id='type-id-913' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='47' column='1' id='type-id-1871'/>
-      <!-- typedef void(*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
+      <!-- typedef void (*)(hb_set_t*, const OT::USHORT&, void*) OT::collect_glyphs_func_t -->
       <typedef-decl name='collect_glyphs_func_t' type-id='type-id-1747' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='627' column='1' id='type-id-1839'/>
-      <!-- typedef bool(*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
+      <!-- typedef bool (*)(hb_set_t*, const OT::USHORT&, void*) OT::intersects_func_t -->
       <typedef-decl name='intersects_func_t' type-id='type-id-1348' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='626' column='1' id='type-id-1838'/>
       <!-- struct OT::Supplier<OT::EntryExitRecord> -->
       <class-decl name='Supplier&lt;OT::EntryExitRecord&gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1748'/>
@@ -30768,23 +30768,23 @@
         <var-decl name='name' type-id='type-id-2013' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <!-- void(*hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::collect_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='collect_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <!-- void(*hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::override_features)(hb_ot_shape_planner_t*) -->
         <var-decl name='override_features' type-id='type-id-2017' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <!-- void*(*hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
+        <!-- void* (* hb_ot_complex_shaper_t::data_create)(const hb_ot_shape_plan_t*) -->
         <var-decl name='data_create' type-id='type-id-2018' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- void(*hb_ot_complex_shaper_t::data_destroy)(void*) -->
+        <!-- void (* hb_ot_complex_shaper_t::data_destroy)(void*) -->
         <var-decl name='data_destroy' type-id='type-id-44' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='101' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- void(*hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::preprocess_text)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='preprocess_text' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='111' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
@@ -30792,15 +30792,15 @@
         <var-decl name='normalization_preference' type-id='type-id-2014' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='114' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <!-- bool(*hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_complex_shaper_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='123' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <!-- bool(*hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_complex_shaper_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <!-- void(*hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+        <!-- void (* hb_ot_complex_shaper_t::setup_masks)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
         <var-decl name='setup_masks' type-id='type-id-2019' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-private.hh' line='142' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
@@ -30831,11 +30831,11 @@
         <var-decl name='unicode' type-id='type-id-84' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <!-- bool(*hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_shape_normalize_context_t::decompose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <var-decl name='decompose' type-id='type-id-2020' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <!-- bool(*hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+        <!-- bool (* hb_ot_shape_normalize_context_t::compose)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <var-decl name='compose' type-id='type-id-2021' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='65' column='1'/>
       </data-member>
     </class-decl>
@@ -31001,9 +31001,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
+    <!-- bool (*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2028' size-in-bits='64' id='type-id-2020'/>
-    <!-- bool(*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
+    <!-- bool (*)(const hb_ot_shape_normalize_context_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <pointer-type-def type-id='type-id-2029' size-in-bits='64' id='type-id-2021'/>
     <!-- const hb_ot_complex_shaper_t -->
     <qualified-type-def type-id='type-id-2016' const='yes' id='type-id-2030'/>
@@ -31029,11 +31029,11 @@
     <reference-type-def kind='lvalue' type-id='type-id-2023' size-in-bits='64' id='type-id-2035'/>
     <!-- hb_ot_shape_planner_t* -->
     <pointer-type-def type-id='type-id-2023' size-in-bits='64' id='type-id-2024'/>
-    <!-- void(*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
+    <!-- void (*)(const hb_ot_shape_plan_t*, hb_buffer_t*, hb_font_t*) -->
     <pointer-type-def type-id='type-id-2036' size-in-bits='64' id='type-id-2019'/>
-    <!-- void(*)(hb_ot_shape_planner_t*) -->
+    <!-- void (*)(hb_ot_shape_planner_t*) -->
     <pointer-type-def type-id='type-id-2037' size-in-bits='64' id='type-id-2017'/>
-    <!-- void*(*)(const hb_ot_shape_plan_t*) -->
+    <!-- void* (*)(const hb_ot_shape_plan_t*) -->
     <pointer-type-def type-id='type-id-2038' size-in-bits='64' id='type-id-2018'/>
     <!-- void hb_ot_shape_plan_collect_lookups(hb_shape_plan_t*, hb_tag_t, hb_set_t*) -->
     <function-decl name='hb_ot_shape_plan_collect_lookups' mangled-name='hb_ot_shape_plan_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_shape_plan_collect_lookups'>
diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index f29ab0bf..2dcbb963 100644
--- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkRenderingLIC-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOXML-6.1.so.1'/>
diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 67e0c80b..20468d2f 100644
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.3' soname='libtcmalloc_and_profiler.so.4'>
   <elf-needed>
     <dependency name='libunwind.so.8'/>
     <dependency name='libpthread.so.0'/>
@@ -2732,13 +2732,13 @@
     </namespace-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/base/linuxthreads.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) ListAllProcessThreadsCallBack -->
+    <!-- typedef int (*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) ListAllProcessThreadsCallBack -->
     <typedef-decl name='ListAllProcessThreadsCallBack' type-id='type-id-77' filepath='./src/base/thread_lister.h' line='48' column='1' id='type-id-78'/>
     <!-- typedef int __pid_t -->
     <typedef-decl name='__pid_t' type-id='type-id-1' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-79'/>
     <!-- typedef __pid_t pid_t -->
     <typedef-decl name='pid_t' type-id='type-id-79' filepath='/usr/include/sched.h' line='37' column='1' id='type-id-80'/>
-    <!-- int(*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
+    <!-- int (*)(void*, int, pid_t*, typedef __va_list_tag __va_list_tag*) -->
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-77'/>
     <!-- pid_t* -->
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-82'/>
@@ -3869,9 +3869,9 @@
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-decl>
-    <!-- int atexit(void(*)(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(*)(void)' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-162'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -4237,11 +4237,11 @@
         <var-decl name='kHashMultiplier' type-id='type-id-191' visibility='default' filepath='src/addressmap-inl.h' line='202' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
-        <!-- void*(*AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
+        <!-- void* (* AddressMap<HeapProfileTable::AllocValue>::alloc_)(unsigned long int) -->
         <var-decl name='alloc_' type-id='type-id-192' visibility='default' filepath='src/addressmap-inl.h' line='251' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='192'>
-        <!-- void(*AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
+        <!-- void (* AddressMap<HeapProfileTable::AllocValue>::dealloc_)(void*) -->
         <var-decl name='dealloc_' type-id='type-id-193' visibility='default' filepath='src/addressmap-inl.h' line='252' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='256'>
@@ -4249,13 +4249,13 @@
         <var-decl name='allocated_' type-id='type-id-194' visibility='default' filepath='src/addressmap-inl.h' line='253' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (*)(unsigned long int), void (*)(void*)) -->
         <function-decl name='AddressMap' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void(*)(void*)' -->
+          <!-- parameter of type 'void (*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4273,26 +4273,26 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)), void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<void (*)(const void*, const HeapProfileTable::AllocInfo&)>(void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)), void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
         <function-decl name='Iterate&lt;void (*)(const void*, const HeapProfileTable::AllocInfo&amp;)&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&))' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&))' -->
           <parameter type-id='type-id-197'/>
-          <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
+          <!-- parameter of type 'void (*)(void*, const HeapProfileTable::AllocInfo&)' -->
           <parameter type-id='type-id-198'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void*(*)(unsigned long int), void(*)(void*)) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::AddressMap(void* (*)(unsigned long int), void (*)(void*)) -->
         <function-decl name='AddressMap' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E' filepath='src/addressmap-inl.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN10AddressMapIN16HeapProfileTable10AllocValueEEC2EPFPvmEPFvS3_E'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
-          <!-- parameter of type 'void(*)(void*)' -->
+          <!-- parameter of type 'void (*)(void*)' -->
           <parameter type-id='type-id-193'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -4310,11 +4310,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void(*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<char*>(void (*)(void*, HeapProfileTable::AllocValue*, char*), char*) -->
         <function-decl name='Iterate&lt;char*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, char*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, char*)' -->
           <parameter type-id='type-id-199'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-3'/>
@@ -4334,11 +4334,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::AddNonLiveArgs*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*), HeapProfileTable::AddNonLiveArgs*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::AddNonLiveArgs*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*)' -->
           <parameter type-id='type-id-201'/>
           <!-- parameter of type 'HeapProfileTable::AddNonLiveArgs*' -->
           <parameter type-id='type-id-202'/>
@@ -4347,11 +4347,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*), HeapProfileTable::Snapshot*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*)' -->
           <parameter type-id='type-id-203'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot*' -->
           <parameter type-id='type-id-204'/>
@@ -4382,11 +4382,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<const HeapProfileTable::DumpArgs&>(void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&), const HeapProfileTable::DumpArgs&) -->
         <function-decl name='Iterate&lt;const HeapProfileTable::DumpArgs&amp;&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&)' -->
           <parameter type-id='type-id-207'/>
           <!-- parameter of type 'const HeapProfileTable::DumpArgs&' -->
           <parameter type-id='type-id-208'/>
@@ -4395,11 +4395,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
+        <!-- void AddressMap<HeapProfileTable::AllocValue>::Iterate<HeapProfileTable::Snapshot::ReportState*>(void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*), HeapProfileTable::Snapshot::ReportState*) -->
         <function-decl name='Iterate&lt;HeapProfileTable::Snapshot::ReportState*&gt;' filepath='src/addressmap-inl.h' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-196' is-artificial='yes'/>
-          <!-- parameter of type 'void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
+          <!-- parameter of type 'void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*)' -->
           <parameter type-id='type-id-209'/>
           <!-- parameter of type 'HeapProfileTable::Snapshot::ReportState*' -->
           <parameter type-id='type-id-210'/>
@@ -4437,11 +4437,11 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t(*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
+        <!-- const HeapProfileTable::AllocValue* AddressMap<HeapProfileTable::AllocValue>::FindInside(size_t (*)(const HeapProfileTable::AllocValue&), unsigned long int, void*, void**) -->
         <function-decl name='FindInside' mangled-name='_ZN10AddressMapIN16HeapProfileTable10AllocValueEE10FindInsideEPFmRKS1_EmPKvPS8_' filepath='src/addressmap-inl.h' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'AddressMap<HeapProfileTable::AllocValue>*' -->
           <parameter type-id='type-id-195' is-artificial='yes'/>
-          <!-- parameter of type 'size_t(*)(const HeapProfileTable::AllocValue&)' -->
+          <!-- parameter of type 'size_t (*)(const HeapProfileTable::AllocValue&)' -->
           <parameter type-id='type-id-212'/>
           <!-- parameter of type 'unsigned long int' -->
           <parameter type-id='type-id-19'/>
@@ -4507,7 +4507,7 @@
     <!-- class GoogleInitializer -->
     <class-decl name='GoogleInitializer' size-in-bits='128' visibility='default' filepath='src/base/googleinit.h' line='39' column='1' id='type-id-215'>
       <member-type access='private'>
-        <!-- typedef void(*)(void) GoogleInitializer::VoidFunction -->
+        <!-- typedef void (*)(void) GoogleInitializer::VoidFunction -->
         <typedef-decl name='VoidFunction' type-id='type-id-162' filepath='src/base/googleinit.h' line='41' column='1' id='type-id-216'/>
       </member-type>
       <data-member access='private' layout-offset-in-bits='0'>
@@ -4730,7 +4730,7 @@
     <!-- class HeapCleaner -->
     <class-decl name='HeapCleaner' size-in-bits='8' visibility='default' filepath='./src/gperftools/heap-checker.h' line='403' column='1' id='type-id-220'>
       <member-type access='private'>
-        <!-- typedef void(*)(void) HeapCleaner::void_function -->
+        <!-- typedef void (*)(void) HeapCleaner::void_function -->
         <typedef-decl name='void_function' type-id='type-id-162' filepath='./src/gperftools/heap-checker.h' line='405' column='1' id='type-id-221'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -5734,11 +5734,11 @@
         </class-decl>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
+        <!-- typedef void (*)(const HeapProfileTable::AllocContextInfo&) HeapProfileTable::AllocContextIterator -->
         <typedef-decl name='AllocContextIterator' type-id='type-id-278' filepath='src/heap-profile-table.h' line='147' column='1' id='type-id-277'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
+        <!-- typedef void (*)(void*, const HeapProfileTable::AllocInfo&) HeapProfileTable::AllocIterator -->
         <typedef-decl name='AllocIterator' type-id='type-id-198' filepath='src/heap-profile-table.h' line='138' column='1' id='type-id-279'/>
       </member-type>
       <member-type access='private'>
@@ -5746,11 +5746,11 @@
         <typedef-decl name='AllocationMap' type-id='type-id-182' filepath='src/heap-profile-table.h' line='224' column='1' id='type-id-270'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void*(*)(size_t) HeapProfileTable::Allocator -->
+        <!-- typedef void* (*)(size_t) HeapProfileTable::Allocator -->
         <typedef-decl name='Allocator' type-id='type-id-192' filepath='src/heap-profile-table.h' line='83' column='1' id='type-id-271'/>
       </member-type>
       <member-type access='private'>
-        <!-- typedef void(*)(void*) HeapProfileTable::DeAllocator -->
+        <!-- typedef void (*)(void*) HeapProfileTable::DeAllocator -->
         <typedef-decl name='DeAllocator' type-id='type-id-193' filepath='src/heap-profile-table.h' line='84' column='1' id='type-id-272'/>
       </member-type>
       <data-member access='private' static='yes'>
@@ -6601,7 +6601,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::IterateBuckets<HeapProfileTable::BufferArgs*>(HeapProfileTable::BufferArgs*) -->
         <function-decl name='IterateBuckets&lt;HeapProfileTable::BufferArgs*&gt;' filepath='src/memory_region_map.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <!-- parameter of type 'void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
+          <!-- parameter of type 'void (*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*)' -->
           <parameter type-id='type-id-314'/>
           <!-- parameter of type 'HeapProfileTable::BufferArgs*' -->
           <parameter type-id='type-id-257'/>
@@ -6612,7 +6612,7 @@
       <member-function access='private' static='yes'>
         <!-- void MemoryRegionMap::HandleSavedRegionsLocked() -->
         <function-decl name='HandleSavedRegionsLocked' mangled-name='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE' filepath='src/memory_region_map.h' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN15MemoryRegionMap24HandleSavedRegionsLockedEPFvRKNS_6RegionEE'>
-          <!-- parameter of type 'void(*)(const MemoryRegionMap::Region&)' -->
+          <!-- parameter of type 'void (*)(const MemoryRegionMap::Region&)' -->
           <parameter type-id='type-id-315'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -7722,13 +7722,13 @@
     <typedef-decl name='LibraryLiveObjectsStacks' type-id='type-id-379' filepath='src/heap-checker.cc' line='397' column='1' id='type-id-380'/>
     <!-- typedef std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > LiveObjectsStack -->
     <typedef-decl name='LiveObjectsStack' type-id='type-id-381' filepath='src/heap-checker.cc' line='384' column='1' id='type-id-382'/>
-    <!-- typedef void(*)(void*) MallocHook_DeleteHook -->
+    <!-- typedef void (*)(void*) MallocHook_DeleteHook -->
     <typedef-decl name='MallocHook_DeleteHook' type-id='type-id-193' filepath='./src/gperftools/malloc_hook_c.h' line='76' column='1' id='type-id-383'/>
-    <!-- typedef void(*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
+    <!-- typedef void (*)(void*, void*, size_t, int, int, int, off_t) MallocHook_MmapHook -->
     <typedef-decl name='MallocHook_MmapHook' type-id='type-id-384' filepath='./src/gperftools/malloc_hook_c.h' line='99' column='1' id='type-id-385'/>
-    <!-- typedef void(*)(void*, size_t) MallocHook_NewHook -->
+    <!-- typedef void (*)(void*, size_t) MallocHook_NewHook -->
     <typedef-decl name='MallocHook_NewHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='70' column='1' id='type-id-387'/>
-    <!-- typedef void(*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
+    <!-- typedef void (*)(void*, ptrdiff_t) MallocHook_SbrkHook -->
     <typedef-decl name='MallocHook_SbrkHook' type-id='type-id-388' filepath='./src/gperftools/malloc_hook_c.h' line='144' column='1' id='type-id-389'/>
     <!-- typedef int RawFD -->
     <typedef-decl name='RawFD' type-id='type-id-1' filepath='./src/base/logging.h' line='251' column='1' id='type-id-85'/>
@@ -8305,7 +8305,7 @@
     <qualified-type-def type-id='type-id-41' const='yes' id='type-id-191'/>
     <!-- const unsigned long int* -->
     <pointer-type-def type-id='type-id-639' size-in-bits='64' id='type-id-640'/>
-    <!-- size_t(*)(const HeapProfileTable::AllocValue&) -->
+    <!-- size_t (*)(const HeapProfileTable::AllocValue&) -->
     <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-212'/>
     <!-- std::_Rb_tree<long unsigned int, long unsigned int, std::_Identity<long unsigned int>, std::less<long unsigned int>, STL_Allocator<long unsigned int, HeapLeakChecker::Allocator> >& -->
     <reference-type-def kind='lvalue' type-id='type-id-498' size-in-bits='64' id='type-id-642'/>
@@ -8461,33 +8461,33 @@
     <reference-type-def kind='lvalue' type-id='type-id-19' size-in-bits='64' id='type-id-726'/>
     <!-- unsigned long int* -->
     <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-333'/>
-    <!-- void(*)(const HeapProfileTable::AllocContextInfo&) -->
+    <!-- void (*)(const HeapProfileTable::AllocContextInfo&) -->
     <pointer-type-def type-id='type-id-727' size-in-bits='64' id='type-id-278'/>
-    <!-- void(*)(void) const -->
+    <!-- void (*)(void) const -->
     <qualified-type-def type-id='type-id-162' const='yes' id='type-id-728'/>
-    <!-- void(*)(void) const& -->
+    <!-- void (*)(void) const& -->
     <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-729'/>
-    <!-- void(*)(void) const* -->
+    <!-- void (*)(void) const* -->
     <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-730'/>
-    <!-- void(*)(void)& -->
+    <!-- void (*)(void)& -->
     <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-731'/>
-    <!-- void(*)(void)* -->
+    <!-- void (*)(void)* -->
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-732'/>
-    <!-- void(*)(void)* const -->
+    <!-- void (*)(void)* const -->
     <qualified-type-def type-id='type-id-732' const='yes' id='type-id-733'/>
-    <!-- void(*)(void)* const& -->
+    <!-- void (*)(void)* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-734'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <pointer-type-def type-id='type-id-735' size-in-bits='64' id='type-id-197'/>
-    <!-- void(*)(void*, const HeapProfileTable::AllocInfo&) -->
+    <!-- void (*)(void*, const HeapProfileTable::AllocInfo&) -->
     <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-198'/>
-    <!-- void(*)(void*, ptrdiff_t) -->
+    <!-- void (*)(void*, ptrdiff_t) -->
     <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-388'/>
-    <!-- void(*)(void*, ptrdiff_t)* -->
+    <!-- void (*)(void*, ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-388' size-in-bits='64' id='type-id-738'/>
-    <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+    <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-384'/>
-    <!-- void(*)(void*, void*, size_t, int, int, int, off_t)* -->
+    <!-- void (*)(void*, void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-740'/>
     <!-- void* const& -->
     <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-369'/>
@@ -11004,13 +11004,13 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void(*)(void) const&, const std::allocator<void (*)()>&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::vector(unsigned long int, void (*)(void) const&, const std::allocator<void (*)()>&) -->
           <function-decl name='vector' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- parameter of type 'const std::allocator<void (*)()>&' -->
             <parameter type-id='type-id-575'/>
@@ -11041,13 +11041,13 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
+          <!-- void (*)(void)& std::vector<void (*)(), std::allocator<void (*)()> >::operator[](unsigned long int) -->
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIPFvvESaIS1_EEixEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void(*)(void)& -->
+            <!-- void (*)(void)& -->
             <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
@@ -11101,24 +11101,24 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void(*)(void) const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::push_back(void (*)(void) const&) -->
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE9push_backERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='733' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
-          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void(*)(void) const&) -->
+          <!-- void std::vector<void (*)(), std::allocator<void (*)()> >::_M_insert_aux(__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >, void (*)(void) const&) -->
           <function-decl name='_M_insert_aux' mangled-name='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/vector.tcc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIPFvvESaIS1_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS1_S3_EERKS1_'>
             <!-- implicit parameter of type 'std::vector<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-222' is-artificial='yes'/>
             <!-- parameter of type 'class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >' -->
             <parameter type-id='type-id-416'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -12111,15 +12111,15 @@
             <!-- class std::allocator<void (*)()> -->
             <base-class access='public' layout-offset-in-bits='0' type-id='type-id-573'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_start -->
               <var-decl name='_M_start' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='76' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_finish -->
               <var-decl name='_M_finish' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='77' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
+              <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_Vector_impl::_M_end_of_storage -->
               <var-decl name='_M_end_of_storage' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='78' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
@@ -12202,11 +12202,11 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void(*)(void)*, unsigned long int) -->
+          <!-- void std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_deallocate(void (*)(void)*, unsigned long int) -->
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE13_M_deallocateEPS1_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-681' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
@@ -12224,13 +12224,13 @@
           </function-decl>
         </member-function>
         <member-function access='public'>
-          <!-- void(*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
+          <!-- void (*)(void)* std::_Vector_base<void (*)(), std::allocator<void (*)()> >::_M_allocate(unsigned long int) -->
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIPFvvESaIS1_EE11_M_allocateEm' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_vector.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'std::_Vector_base<void (*)(), std::allocator<void (*)()> >*' -->
             <parameter type-id='type-id-681' is-artificial='yes'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -12459,11 +12459,11 @@
       <!-- struct std::__miter_base<void (**)(), false> -->
       <class-decl name='__miter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='285' column='1' id='type-id-788'>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__miter_base<void (**)(), false>::__b() -->
+          <!-- void (*)(void)* std::__miter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__miter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -12507,11 +12507,11 @@
       <!-- struct std::__niter_base<void (**)(), false> -->
       <class-decl name='__niter_base&lt;void (**)(), false&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='267' column='1' id='type-id-792'>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__niter_base<void (**)(), false>::__b() -->
+          <!-- void (*)(void)* std::__niter_base<void (**)(), false>::__b() -->
           <function-decl name='__b' mangled-name='_ZNSt12__niter_baseIPPFvvELb0EE3__bES2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -13189,15 +13189,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_a<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='386' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::__copy_move_a2<false, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
@@ -13211,15 +13211,15 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_a2<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='431' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > std::copy<__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > >(__gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >, __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > >) -->
@@ -13233,15 +13233,15 @@
         <!-- class __gnu_cxx::__normal_iterator<AllocObject*, std::vector<AllocObject, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> > > -->
         <return type-id='type-id-410'/>
       </function-decl>
-      <!-- void(*)(void)* std::copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='458' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__copy_move_backward_a<false, AllocObject*, AllocObject*>(AllocObject*, AllocObject*, AllocObject*) -->
@@ -13255,15 +13255,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_backward_a<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_backward_a&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='582' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a<false, void**, void**>(void**, void**, void**) -->
@@ -13288,15 +13288,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::__copy_move_backward_a2<false, void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='__copy_move_backward_a2&lt;false, void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__copy_move_backward_a2<false, void**, void**>(void**, void**, void**) -->
@@ -13321,15 +13321,15 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::copy_backward<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::copy_backward<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='copy_backward&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='628' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::copy_backward<void**, void**>(void**, void**, void**) -->
@@ -13343,11 +13343,11 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)()>(void(*)(void)*, void(*)(void)*) -->
+      <!-- void std::_Destroy<void (**)()>(void (*)(void)*, void (*)(void)*) -->
       <function-decl name='_Destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -13374,11 +13374,11 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::_Destroy<void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void std::_Destroy<void (**)(), void (*)()>(void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='_Destroy&lt;void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
@@ -13430,15 +13430,15 @@
         <!-- struct std::pair<long unsigned int, long unsigned int> -->
         <return type-id='type-id-622'/>
       </function-decl>
-      <!-- void(*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*) -->
+      <!-- void (*)(void)* std::uninitialized_copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*) -->
       <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_copy_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
@@ -13480,17 +13480,17 @@
         <!-- void** -->
         <return type-id='type-id-174'/>
       </function-decl>
-      <!-- void(*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void (*)(void)* std::__uninitialized_copy_a<void (**)(), void (**)(), void (*)()>(void (*)(void)*, void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_copy_a&lt;void (**)(), void (**)(), void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- AllocObject* std::__uninitialized_move_a<AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator> >(AllocObject*, AllocObject*, AllocObject*, STL_Allocator<AllocObject, HeapLeakChecker::Allocator>&) -->
@@ -13506,17 +13506,17 @@
         <!-- AllocObject* -->
         <return type-id='type-id-322'/>
       </function-decl>
-      <!-- void(*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void(*)(void)*, void(*)(void)*, void(*)(void)*, std::allocator<void (*)()>&) -->
+      <!-- void (*)(void)* std::__uninitialized_move_a<void (**)(), void (**)(), std::allocator<void (*)()> >(void (*)(void)*, void (*)(void)*, void (*)(void)*, std::allocator<void (*)()>&) -->
       <function-decl name='__uninitialized_move_a&lt;void (**)(), void (**)(), std::allocator&lt;void (*)()&gt; &gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
-        <!-- parameter of type 'void(*)(void)*' -->
+        <!-- parameter of type 'void (*)(void)*' -->
         <parameter type-id='type-id-732'/>
         <!-- parameter of type 'std::allocator<void (*)()>&' -->
         <parameter type-id='type-id-687'/>
-        <!-- void(*)(void)* -->
+        <!-- void (*)(void)* -->
         <return type-id='type-id-732'/>
       </function-decl>
       <!-- void** std::__uninitialized_move_a<void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator> >(void**, void**, void**, STL_Allocator<void*, HeapLeakChecker::Allocator>&) -->
@@ -13910,7 +13910,7 @@
       <!-- class __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > > -->
       <class-decl name='__normal_iterator&lt;void (**)(), std::vector&lt;void (*)(), std::allocator&lt;void (*)()&gt; &gt; &gt;' size-in-bits='64' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='669' column='1' id='type-id-416'>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <!-- void(*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
+          <!-- void (*)(void)* __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::_M_current -->
           <var-decl name='_M_current' type-id='type-id-732' visibility='default' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='671' column='1'/>
         </data-member>
         <member-function access='private'>
@@ -13923,31 +13923,31 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void(*)(void)* const&) -->
+          <!-- void __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::__normal_iterator(void (*)(void)* const&) -->
           <function-decl name='__normal_iterator' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='686' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-418' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)* const&' -->
+            <!-- parameter of type 'void (*)(void)* const&' -->
             <parameter type-id='type-id-734'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
+          <!-- void (*)(void)* const& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::base() -->
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEE4baseEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void(*)(void)* const& -->
+            <!-- void (*)(void)* const& -->
             <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
+          <!-- void (*)(void)& __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >::operator*() -->
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPPFvvESt6vectorIS2_SaIS2_EEEdeEv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_iterator.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type 'const __gnu_cxx::__normal_iterator<void (**)(), std::vector<void (*)(), std::allocator<void (*)()> > >*' -->
             <parameter type-id='type-id-480' is-artificial='yes'/>
-            <!-- void(*)(void)& -->
+            <!-- void (*)(void)& -->
             <return type-id='type-id-731'/>
           </function-decl>
         </member-function>
@@ -14042,11 +14042,11 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void(*)(void)*, unsigned long int) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::deallocate(void (*)(void)*, unsigned long int) -->
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE10deallocateEPS2_m' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- parameter of type 'unsigned long int' -->
             <parameter type-id='type-id-19'/>
@@ -14055,7 +14055,7 @@
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void(*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
+          <!-- void (*)(void)* __gnu_cxx::new_allocator<void (*)()>::allocate(unsigned long int, void*) -->
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE8allocateEmPKv' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='84' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
@@ -14063,29 +14063,29 @@
             <parameter type-id='type-id-19'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-73'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void(*)(void)*, void(*)(void) const&) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::construct(void (*)(void)*, void (*)(void) const&) -->
           <function-decl name='construct' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE9constructEPS2_RKS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void) const&' -->
+            <!-- parameter of type 'void (*)(void) const&' -->
             <parameter type-id='type-id-729'/>
             <!-- void -->
             <return type-id='type-id-75'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
-          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void(*)(void)*) -->
+          <!-- void __gnu_cxx::new_allocator<void (*)()>::destroy(void (*)(void)*) -->
           <function-decl name='destroy' mangled-name='_ZN9__gnu_cxx13new_allocatorIPFvvEE7destroyEPS2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/ext/new_allocator.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- implicit parameter of type '__gnu_cxx::new_allocator<void (*)()>*' -->
             <parameter type-id='type-id-423' is-artificial='yes'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -14242,20 +14242,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
+            <!-- void (*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Traverse(void (*)(void*, void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_miiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-488' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)*' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-740'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14282,33 +14282,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- void (*)(void*, void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
-              <!-- void(*)(void*, void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-384'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Remove(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>::Add(void (*)(void*, void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_miiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-425' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-384'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14326,20 +14326,20 @@
             <var-decl name='priv_data' type-id='type-id-178' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
+            <!-- void (*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- void(*)(void*, ptrdiff_t) -->
+              <!-- void (*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void(*)(void*, ptrdiff_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Traverse(void (*)(void*, ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvlEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-490' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)*' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)*' -->
               <parameter type-id='type-id-738'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -14366,33 +14366,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void(*)(void*, ptrdiff_t)) -->
+            <!-- void (*)(void*, ptrdiff_t) base::internal::HookList<void (*)(const void*, ptrdiff_t)>::ExchangeSingular(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
-              <!-- void(*)(void*, ptrdiff_t) -->
+              <!-- void (*)(void*, ptrdiff_t) -->
               <return type-id='type-id-388'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void(*)(void*, ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Remove(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void(*)(void*, ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, ptrdiff_t)>::Add(void (*)(void*, ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvlEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, ptrdiff_t)>*' -->
               <parameter type-id='type-id-427' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(void*, ptrdiff_t)' -->
               <parameter type-id='type-id-388'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -14503,13 +14503,13 @@
       <!-- void -->
       <return type-id='type-id-75'/>
     </function-type>
-    <!-- void (void*, HeapProfileTable::AllocValue*, void(*)(void*, const HeapProfileTable::AllocInfo&)) -->
+    <!-- void (void*, HeapProfileTable::AllocValue*, void (*)(void*, const HeapProfileTable::AllocInfo&)) -->
     <function-type size-in-bits='64' id='type-id-735'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-73'/>
       <!-- parameter of type 'HeapProfileTable::AllocValue*' -->
       <parameter type-id='type-id-213'/>
-      <!-- parameter of type 'void(*)(void*, const HeapProfileTable::AllocInfo&)' -->
+      <!-- parameter of type 'void (*)(void*, const HeapProfileTable::AllocInfo&)' -->
       <parameter type-id='type-id-198'/>
       <!-- void -->
       <return type-id='type-id-75'/>
@@ -14583,7 +14583,7 @@
     <pointer-type-def type-id='type-id-859' size-in-bits='64' id='type-id-860'/>
     <!-- __gnu_cxx::new_allocator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >* -->
     <pointer-type-def type-id='type-id-861' size-in-bits='64' id='type-id-862'/>
-    <!-- bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
+    <!-- bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*) -->
     <pointer-type-def type-id='type-id-863' size-in-bits='64' id='type-id-864'/>
     <!-- bool* -->
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-127'/>
@@ -14693,17 +14693,17 @@
     <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-924'/>
     <!-- std::pair<std::_Rb_tree_iterator<std::pair<HeapProfileTable::Bucket* const, HeapProfileTable::Snapshot::Entry> >, bool>* -->
     <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-926'/>
-    <!-- void(*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
+    <!-- void (*)(const HeapProfileBucket*, HeapProfileTable::BufferArgs*) -->
     <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-314'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::AddNonLiveArgs*) -->
     <pointer-type-def type-id='type-id-928' size-in-bits='64' id='type-id-201'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot*) -->
     <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-203'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, HeapProfileTable::Snapshot::ReportState*) -->
     <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-209'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, char*) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, char*) -->
     <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-199'/>
-    <!-- void(*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
+    <!-- void (*)(void*, HeapProfileTable::AllocValue*, const HeapProfileTable::DumpArgs&) -->
     <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-207'/>
     <!-- AddressMap<HeapProfileTable::AllocValue>::Cluster* -->
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-205'/>
@@ -16382,7 +16382,7 @@
         <!-- const HeapProfileTable::Snapshot::Entry& -->
         <return type-id='type-id-267'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- HeapProfileTable::AllocValue::Bucket* const& std::__median<HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, HeapProfileTable::AllocValue::Bucket* const&, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__median&lt;HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
@@ -16390,7 +16390,7 @@
         <parameter type-id='type-id-855'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket* const&' -->
         <parameter type-id='type-id-855'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket* const& -->
         <return type-id='type-id-855'/>
@@ -16406,7 +16406,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__heap_select<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__heap_select&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__heap_selectIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1913' column='1'/>
@@ -16414,7 +16414,7 @@
         <parameter type-id='type-id-280' name='__middle' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1914' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='1915' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16428,13 +16428,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__unguarded_linear_insert<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_linear_insert&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2079' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16448,13 +16448,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIPP17HeapProfileBucketPFbP16HeapProfileStatsS4_EEvT_S7_T0_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2119' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2120' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16468,13 +16468,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__unguarded_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2154' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16488,13 +16488,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__final_insertion_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__final_insertion_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2188' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16510,7 +16510,7 @@
         <!-- HeapProfileTable::Snapshot::Entry* -->
         <return type-id='type-id-265'/>
       </function-decl>
-      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- HeapProfileTable::AllocValue::Bucket** std::__unguarded_partition<HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__unguarded_partition&lt;HeapProfileTable::Bucket**, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2224' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16518,7 +16518,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- HeapProfileTable::AllocValue::Bucket** -->
         <return type-id='type-id-280'/>
@@ -16534,7 +16534,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__introsort_loop<HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, long int, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__introsort_loop&lt;HeapProfileTable::Bucket**, long int, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIPP17HeapProfileBucketlPFbP16HeapProfileStatsS4_EEvT_S7_T0_T1_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2277' column='1'/>
@@ -16542,7 +16542,7 @@
         <parameter type-id='type-id-280' name='__last' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2278' column='1'/>
         <!-- parameter of type 'long int' -->
         <parameter type-id='type-id-18' name='__depth_limit' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='2279' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16565,7 +16565,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::partial_sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='partial_sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5095' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16573,7 +16573,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16587,13 +16587,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::sort<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algo.h' line='5244' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16750,7 +16750,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__push_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__push_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16760,7 +16760,7 @@
         <parameter type-id='type-id-18'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16789,7 +16789,7 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__adjust_heap<HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, long int, long int, HeapProfileTable::AllocValue::Bucket*, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__adjust_heap&lt;HeapProfileTable::Bucket**, long int, HeapProfileTable::Bucket*, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' mangled-name='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIPP17HeapProfileBucketlS1_PFbP16HeapProfileStatsS4_EEvT_T0_S8_T1_T2_'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280' name='__first' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='295' column='1'/>
@@ -16799,12 +16799,12 @@
         <parameter type-id='type-id-18' name='__len' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket*' -->
         <parameter type-id='type-id-255' name='__value' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864' name='__comp' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='296' column='1'/>
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::__pop_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='__pop_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
@@ -16812,7 +16812,7 @@
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16826,13 +16826,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::make_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='make_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='414' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -16846,13 +16846,13 @@
         <!-- void -->
         <return type-id='type-id-75'/>
       </function-decl>
-      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
+      <!-- void std::sort_heap<HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)>(HeapProfileTable::AllocValue::Bucket**, HeapProfileTable::AllocValue::Bucket**, bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)) -->
       <function-decl name='sort_heap&lt;HeapProfileTable::Bucket**, bool (*)(HeapProfileTable::Stats*, HeapProfileTable::Stats*)&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_heap.h' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
         <!-- parameter of type 'HeapProfileTable::AllocValue::Bucket**' -->
         <parameter type-id='type-id-280'/>
-        <!-- parameter of type 'bool(*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
+        <!-- parameter of type 'bool (*)(HeapProfileTable::DumpArgs::Stats*, HeapProfileTable::DumpArgs::Stats*)' -->
         <parameter type-id='type-id-864'/>
         <!-- void -->
         <return type-id='type-id-75'/>
@@ -17278,7 +17278,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1013' size-in-bits='64' id='type-id-1014'/>
     <!-- tcmalloc::Logger* -->
     <pointer-type-def type-id='type-id-1015' size-in-bits='64' id='type-id-1016'/>
-    <!-- void(*)(const char*, int) -->
+    <!-- void (*)(const char*, int) -->
     <pointer-type-def type-id='type-id-1017' size-in-bits='64' id='type-id-1018'/>
     <!-- namespace base -->
     <namespace-decl name='base'>
@@ -17384,7 +17384,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <!-- void(*tcmalloc::log_message_writer)(const char*, int) -->
+      <!-- void (* tcmalloc::log_message_writer)(const char*, int) -->
       <var-decl name='log_message_writer' type-id='type-id-1018' mangled-name='_ZN8tcmalloc18log_message_writerE' visibility='default' filepath='src/internal_logging.cc' line='63' column='1' elf-symbol-id='_ZN8tcmalloc18log_message_writerE'/>
       <!-- void tcmalloc::Log(tcmalloc::LogMode, const char*, int, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem, tcmalloc::LogItem) -->
       <function-decl name='Log' mangled-name='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_' filepath='src/internal_logging.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN8tcmalloc3LogENS_7LogModeEPKciNS_7LogItemES3_S3_S3_'>
@@ -18013,17 +18013,17 @@
     </function-decl>
   </abi-instr>
   <abi-instr address-size='64' path='src/malloc_hook.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-kFgaKP/gperftools-2.4' language='LANG_C_plus_plus'>
-    <!-- typedef int(*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
+    <!-- typedef int (*)(void*, size_t, int, int, int, off_t, void**) MallocHook_MmapReplacement -->
     <typedef-decl name='MallocHook_MmapReplacement' type-id='type-id-1047' filepath='./src/gperftools/malloc_hook_c.h' line='111' column='1' id='type-id-1048'/>
-    <!-- typedef void(*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
+    <!-- typedef void (*)(void*, void*, size_t, size_t, int, void*) MallocHook_MremapHook -->
     <typedef-decl name='MallocHook_MremapHook' type-id='type-id-1049' filepath='./src/gperftools/malloc_hook_c.h' line='132' column='1' id='type-id-1050'/>
-    <!-- typedef void(*)(void*, size_t) MallocHook_MunmapHook -->
+    <!-- typedef void (*)(void*, size_t) MallocHook_MunmapHook -->
     <typedef-decl name='MallocHook_MunmapHook' type-id='type-id-386' filepath='./src/gperftools/malloc_hook_c.h' line='115' column='1' id='type-id-1051'/>
-    <!-- typedef int(*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
+    <!-- typedef int (*)(void*, size_t, int*) MallocHook_MunmapReplacement -->
     <typedef-decl name='MallocHook_MunmapReplacement' type-id='type-id-1052' filepath='./src/gperftools/malloc_hook_c.h' line='123' column='1' id='type-id-1053'/>
-    <!-- typedef void(*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
+    <!-- typedef void (*)(void*, size_t, int, int, int, off_t) MallocHook_PreMmapHook -->
     <typedef-decl name='MallocHook_PreMmapHook' type-id='type-id-1054' filepath='./src/gperftools/malloc_hook_c.h' line='87' column='1' id='type-id-1055'/>
-    <!-- typedef void(*)(ptrdiff_t) MallocHook_PreSbrkHook -->
+    <!-- typedef void (*)(ptrdiff_t) MallocHook_PreSbrkHook -->
     <typedef-decl name='MallocHook_PreSbrkHook' type-id='type-id-1056' filepath='./src/gperftools/malloc_hook_c.h' line='138' column='1' id='type-id-1057'/>
     <!-- base::internal::HookList<int (*)(const void*, size_t, int*)>* -->
     <pointer-type-def type-id='type-id-1058' size-in-bits='64' id='type-id-1059'/>
@@ -18055,25 +18055,25 @@
     <qualified-type-def type-id='type-id-1066' const='yes' id='type-id-1076'/>
     <!-- const base::internal::HookList<void (*)(ptrdiff_t)>* -->
     <pointer-type-def type-id='type-id-1076' size-in-bits='64' id='type-id-1077'/>
-    <!-- int(*)(void*, size_t, int*) -->
+    <!-- int (*)(void*, size_t, int*) -->
     <pointer-type-def type-id='type-id-1078' size-in-bits='64' id='type-id-1052'/>
-    <!-- int(*)(void*, size_t, int*)* -->
+    <!-- int (*)(void*, size_t, int*)* -->
     <pointer-type-def type-id='type-id-1052' size-in-bits='64' id='type-id-1079'/>
-    <!-- int(*)(void*, size_t, int, int, int, off_t, void**) -->
+    <!-- int (*)(void*, size_t, int, int, int, off_t, void**) -->
     <pointer-type-def type-id='type-id-1080' size-in-bits='64' id='type-id-1047'/>
-    <!-- int(*)(void*, size_t, int, int, int, off_t, void**)* -->
+    <!-- int (*)(void*, size_t, int, int, int, off_t, void**)* -->
     <pointer-type-def type-id='type-id-1047' size-in-bits='64' id='type-id-1081'/>
-    <!-- void(*)(ptrdiff_t) -->
+    <!-- void (*)(ptrdiff_t) -->
     <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-1056'/>
-    <!-- void(*)(ptrdiff_t)* -->
+    <!-- void (*)(ptrdiff_t)* -->
     <pointer-type-def type-id='type-id-1056' size-in-bits='64' id='type-id-1083'/>
-    <!-- void(*)(void*, size_t, int, int, int, off_t) -->
+    <!-- void (*)(void*, size_t, int, int, int, off_t) -->
     <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-1054'/>
-    <!-- void(*)(void*, size_t, int, int, int, off_t)* -->
+    <!-- void (*)(void*, size_t, int, int, int, off_t)* -->
     <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-1085'/>
-    <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
+    <!-- void (*)(void*, void*, size_t, size_t, int, void*) -->
     <pointer-type-def type-id='type-id-1086' size-in-bits='64' id='type-id-1049'/>
-    <!-- void(*)(void*, void*, size_t, size_t, int, void*)* -->
+    <!-- void (*)(void*, void*, size_t, size_t, int, void*)* -->
     <pointer-type-def type-id='type-id-1049' size-in-bits='64' id='type-id-1087'/>
     <!-- volatile base::subtle::Atomic64* -->
     <pointer-type-def type-id='type-id-1088' size-in-bits='64' id='type-id-108'/>
@@ -18200,11 +18200,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int(*)(void*, size_t, int*)*, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int*)>::Traverse(int (*)(void*, size_t, int*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmPiEE8TraverseEPS6_i' filepath='src/malloc_hook.cc' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1069' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)*' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)*' -->
               <parameter type-id='type-id-1079'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18222,11 +18222,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int(*)(void*, size_t, int*)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Remove(int (*)(void*, size_t, int*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE6RemoveES6_' filepath='src/malloc_hook.cc' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18242,11 +18242,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int(*)(void*, size_t, int*)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int*)>::Add(int (*)(void*, size_t, int*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmPiEE3AddES6_' filepath='src/malloc_hook.cc' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int*)>*' -->
               <parameter type-id='type-id-1059' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int*)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int*)' -->
               <parameter type-id='type-id-1052'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18264,11 +18264,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int(*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
+            <!-- int base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Traverse(int (*)(void*, size_t, int, int, int, off_t, void**)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFiPKvmiiilPPvEE8TraverseEPS7_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1071' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)*' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)*' -->
               <parameter type-id='type-id-1081'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18295,22 +18295,22 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Remove(int (*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE6RemoveES7_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int(*)(void*, size_t, int, int, int, off_t, void**)) -->
+            <!-- bool base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>::Add(int (*)(void*, size_t, int, int, int, off_t, void**)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFiPKvmiiilPPvEE3AddES7_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<int (*)(const void*, size_t, int, int, int, off_t, void**)>*' -->
               <parameter type-id='type-id-1061' is-artificial='yes'/>
-              <!-- parameter of type 'int(*)(void*, size_t, int, int, int, off_t, void**)' -->
+              <!-- parameter of type 'int (*)(void*, size_t, int, int, int, off_t, void**)' -->
               <parameter type-id='type-id-1047'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18330,11 +18330,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void(*)(void*, void*, size_t, size_t, int, void*)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Traverse(void (*)(void*, void*, size_t, size_t, int, void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvS3_mmiS3_EE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1073' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)*' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)*' -->
               <parameter type-id='type-id-1087'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18361,33 +18361,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- void (*)(void*, void*, size_t, size_t, int, void*) base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::ExchangeSingular(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
-              <!-- void(*)(void*, void*, size_t, size_t, int, void*) -->
+              <!-- void (*)(void*, void*, size_t, size_t, int, void*) -->
               <return type-id='type-id-1049'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Remove(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void(*)(void*, void*, size_t, size_t, int, void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>::Add(void (*)(void*, void*, size_t, size_t, int, void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvS3_mmiS3_EE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, const void*, size_t, size_t, int, const void*)>*' -->
               <parameter type-id='type-id-1063' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, void*, size_t, size_t, int, void*)' -->
+              <!-- parameter of type 'void (*)(void*, void*, size_t, size_t, int, void*)' -->
               <parameter type-id='type-id-1049'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18407,11 +18407,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void(*)(void*, size_t, int, int, int, off_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Traverse(void (*)(void*, size_t, int, int, int, off_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmiiilEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1075' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)*' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)*' -->
               <parameter type-id='type-id-1085'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18438,33 +18438,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- void (*)(void*, size_t, int, int, int, off_t) base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::ExchangeSingular(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
-              <!-- void(*)(void*, size_t, int, int, int, off_t) -->
+              <!-- void (*)(void*, size_t, int, int, int, off_t) -->
               <return type-id='type-id-1054'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Remove(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void(*)(void*, size_t, int, int, int, off_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>::Add(void (*)(void*, size_t, int, int, int, off_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmiiilEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t, int, int, int, off_t)>*' -->
               <parameter type-id='type-id-1065' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t, int, int, int, off_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t, int, int, int, off_t)' -->
               <parameter type-id='type-id-1054'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18482,11 +18482,11 @@
             <var-decl name='priv_data' type-id='type-id-1093' visibility='default' filepath='src/malloc_hook-inl.h' line='102' column='1'/>
           </data-member>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void(*)(ptrdiff_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(ptrdiff_t)>::Traverse(void (*)(ptrdiff_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvlEE8TraverseEPS3_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1077' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)*' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)*' -->
               <parameter type-id='type-id-1083'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -18513,33 +18513,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void(*)(ptrdiff_t)) -->
+            <!-- void (*)(ptrdiff_t) base::internal::HookList<void (*)(ptrdiff_t)>::ExchangeSingular(void (*)(ptrdiff_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvlEE16ExchangeSingularES3_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
-              <!-- void(*)(ptrdiff_t) -->
+              <!-- void (*)(ptrdiff_t) -->
               <return type-id='type-id-1056'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void(*)(ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Remove(void (*)(ptrdiff_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvlEE6RemoveES3_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void(*)(ptrdiff_t)) -->
+            <!-- bool base::internal::HookList<void (*)(ptrdiff_t)>::Add(void (*)(ptrdiff_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvlEE3AddES3_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(ptrdiff_t)>*' -->
               <parameter type-id='type-id-1067' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(ptrdiff_t)' -->
+              <!-- parameter of type 'void (*)(ptrdiff_t)' -->
               <parameter type-id='type-id-1056'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -18916,11 +18916,11 @@
     <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1099'/>
     <!-- pthread_once_t* -->
     <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1101'/>
-    <!-- int perftools_pthread_key_create(pthread_key_t*, void(*)(void*)) -->
+    <!-- int perftools_pthread_key_create(pthread_key_t*, void (*)(void*)) -->
     <function-decl name='perftools_pthread_key_create' mangled-name='_Z28perftools_pthread_key_createPjPFvPvE' filepath='src/maybe_threads.cc' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28perftools_pthread_key_createPjPFvPvE'>
       <!-- parameter of type 'pthread_key_t*' -->
       <parameter type-id='type-id-1099' name='key' filepath='src/maybe_threads.cc' line='90' column='1'/>
-      <!-- parameter of type 'void(*)(void*)' -->
+      <!-- parameter of type 'void (*)(void*)' -->
       <parameter type-id='type-id-193' name='destr_function' filepath='src/maybe_threads.cc' line='91' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -18948,11 +18948,11 @@
       <!-- int -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- int perftools_pthread_once(pthread_once_t*, void(*)(void)) -->
+    <!-- int perftools_pthread_once(pthread_once_t*, void (*)(void)) -->
     <function-decl name='perftools_pthread_once' mangled-name='_Z22perftools_pthread_oncePiPFvvE' filepath='src/maybe_threads.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22perftools_pthread_oncePiPFvvE'>
       <!-- parameter of type 'pthread_once_t*' -->
       <parameter type-id='type-id-1101' name='ctl' filepath='src/maybe_threads.cc' line='128' column='1'/>
-      <!-- parameter of type 'void(*)(void)' -->
+      <!-- parameter of type 'void (*)(void)' -->
       <parameter type-id='type-id-162' name='init_routine' filepath='src/maybe_threads.cc' line='129' column='1'/>
       <!-- int -->
       <return type-id='type-id-1'/>
@@ -19320,7 +19320,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-1144'/>
     <!-- std::set<MemoryRegionMap::Region, MemoryRegionMap::RegionCmp, STL_Allocator<MemoryRegionMap::Region, MemoryRegionMap::MyAllocator> >* -->
     <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-1145'/>
-    <!-- void(*)(const MemoryRegionMap::Region&) -->
+    <!-- void (*)(const MemoryRegionMap::Region&) -->
     <pointer-type-def type-id='type-id-1146' size-in-bits='64' id='type-id-315'/>
     <!-- const std::_Rb_tree_node<MemoryRegionMap::Region> -->
     <qualified-type-def type-id='type-id-1147' const='yes' id='type-id-1148'/>
@@ -20487,7 +20487,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <!-- typedef void(*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
+    <!-- typedef void (*)(int, siginfo_t*, void*, void*) ProfileHandlerCallback -->
     <typedef-decl name='ProfileHandlerCallback' type-id='type-id-1186' filepath='src/profile-handler.h' line='95' column='1' id='type-id-1179'/>
     <!-- typedef int pthread_once_t -->
     <typedef-decl name='pthread_once_t' type-id='type-id-1' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-1100'/>
@@ -20575,7 +20575,7 @@
     <pointer-type-def type-id='type-id-1173' size-in-bits='64' id='type-id-1230'/>
     <!-- timer_id_holder* -->
     <pointer-type-def type-id='type-id-1183' size-in-bits='64' id='type-id-1185'/>
-    <!-- void(*)(int, siginfo_t*, void*, void*) -->
+    <!-- void (*)(int, siginfo_t*, void*, void*) -->
     <pointer-type-def type-id='type-id-1231' size-in-bits='64' id='type-id-1186'/>
     <!-- const std::_List_node<ProfileHandlerToken*> -->
     <qualified-type-def type-id='type-id-1232' const='yes' id='type-id-1233'/>
@@ -21259,7 +21259,7 @@
         <var-decl name='collector_' type-id='type-id-1251' visibility='default' filepath='src/profiler.cc' line='120' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='512'>
-        <!-- int(*CpuProfiler::filter_)(void*) -->
+        <!-- int (* CpuProfiler::filter_)(void*) -->
         <var-decl name='filter_' type-id='type-id-1252' visibility='default' filepath='src/profiler.cc' line='125' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='576'>
@@ -21691,7 +21691,7 @@
     <!-- struct ProfilerOptions -->
     <class-decl name='ProfilerOptions' size-in-bits='128' is-struct='yes' visibility='default' filepath='./src/gperftools/profiler.h' line='89' column='1' id='type-id-1272'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- int(*ProfilerOptions::filter_in_thread)(void*) -->
+        <!-- int (* ProfilerOptions::filter_in_thread)(void*) -->
         <var-decl name='filter_in_thread' type-id='type-id-1252' visibility='default' filepath='./src/gperftools/profiler.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
@@ -21923,7 +21923,7 @@
     <qualified-type-def type-id='type-id-1272' const='yes' id='type-id-1291'/>
     <!-- const ProfilerOptions* -->
     <pointer-type-def type-id='type-id-1291' size-in-bits='64' id='type-id-1255'/>
-    <!-- int(*)(void*) -->
+    <!-- int (*)(void*) -->
     <pointer-type-def type-id='type-id-1292' size-in-bits='64' id='type-id-1252'/>
     <!-- siginfo_t* -->
     <pointer-type-def type-id='type-id-1286' size-in-bits='64' id='type-id-1177'/>
@@ -26215,15 +26215,15 @@
         <var-decl name='root_' type-id='type-id-1429' visibility='default' filepath='src/pagemap.h' line='229' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='64'>
-        <!-- void*(*TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
+        <!-- void* (* TCMalloc_PageMap3<35>::allocator_)(unsigned long int) -->
         <var-decl name='allocator_' type-id='type-id-192' visibility='default' filepath='src/pagemap.h' line='230' column='1'/>
       </data-member>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26241,22 +26241,22 @@
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
-        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void*(*)(unsigned long int)) -->
+        <!-- void TCMalloc_PageMap3<35>::TCMalloc_PageMap3(void* (*)(unsigned long int)) -->
         <function-decl name='TCMalloc_PageMap3' filepath='src/pagemap.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'TCMalloc_PageMap3<35>*' -->
           <parameter type-id='type-id-1430' is-artificial='yes'/>
-          <!-- parameter of type 'void*(*)(unsigned long int)' -->
+          <!-- parameter of type 'void* (*)(unsigned long int)' -->
           <parameter type-id='type-id-192'/>
           <!-- void -->
           <return type-id='type-id-75'/>
@@ -26857,7 +26857,7 @@
     <typedef-decl name='_IO_lock_t' type-id='type-id-75' filepath='/usr/include/libio.h' line='180' column='1' id='type-id-1458'/>
     <!-- typedef _IO_FILE __FILE -->
     <typedef-decl name='__FILE' type-id='type-id-149' filepath='/usr/include/stdio.h' line='65' column='1' id='type-id-1459'/>
-    <!-- typedef int(*)(void*, void*) __compar_fn_t -->
+    <!-- typedef int (*)(void*, void*) __compar_fn_t -->
     <typedef-decl name='__compar_fn_t' type-id='type-id-1460' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-163'/>
     <!-- typedef long int __off64_t -->
     <typedef-decl name='__off64_t' type-id='type-id-18' filepath='/usr/include/bits/types.h' line='142' column='1' id='type-id-156'/>
@@ -27141,7 +27141,7 @@
     <pointer-type-def type-id='type-id-1543' size-in-bits='64' id='type-id-6'/>
     <!-- const wchar_t** -->
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-14'/>
-    <!-- int(*)(void*, void*) -->
+    <!-- int (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1544' size-in-bits='64' id='type-id-1460'/>
     <!-- int* -->
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-1023'/>
@@ -27213,25 +27213,25 @@
     <pointer-type-def type-id='type-id-1448' size-in-bits='64' id='type-id-23'/>
     <!-- uint64_t* -->
     <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-1578'/>
-    <!-- void(*)(void) -->
+    <!-- void (*)(void) -->
     <pointer-type-def type-id='type-id-1579' size-in-bits='64' id='type-id-162'/>
-    <!-- void(*)(void*) -->
+    <!-- void (*)(void*) -->
     <pointer-type-def type-id='type-id-852' size-in-bits='64' id='type-id-193'/>
-    <!-- void(*)(void*)* -->
+    <!-- void (*)(void*)* -->
     <pointer-type-def type-id='type-id-193' size-in-bits='64' id='type-id-1580'/>
-    <!-- void(*)(void*, size_t) -->
+    <!-- void (*)(void*, size_t) -->
     <pointer-type-def type-id='type-id-1581' size-in-bits='64' id='type-id-386'/>
-    <!-- void(*)(void*, size_t)* -->
+    <!-- void (*)(void*, size_t)* -->
     <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-1582'/>
-    <!-- void(*)(void*, void*) -->
+    <!-- void (*)(void*, void*) -->
     <pointer-type-def type-id='type-id-1583' size-in-bits='64' id='type-id-1584'/>
-    <!-- void*(*)(size_t, size_t, void*) -->
+    <!-- void* (*)(size_t, size_t, void*) -->
     <pointer-type-def type-id='type-id-1585' size-in-bits='64' id='type-id-1586'/>
-    <!-- void*(*)(size_t, void*) -->
+    <!-- void* (*)(size_t, void*) -->
     <pointer-type-def type-id='type-id-1587' size-in-bits='64' id='type-id-1588'/>
-    <!-- void*(*)(unsigned long int) -->
+    <!-- void* (*)(unsigned long int) -->
     <pointer-type-def type-id='type-id-853' size-in-bits='64' id='type-id-192'/>
-    <!-- void*(*)(void*, size_t, void*) -->
+    <!-- void* (*)(void*, size_t, void*) -->
     <pointer-type-def type-id='type-id-1589' size-in-bits='64' id='type-id-1590'/>
     <!-- void** -->
     <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-174'/>
@@ -27631,11 +27631,11 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void(*)(void)*) -->
+          <!-- void std::_Destroy_aux<true>::__destroy<void (**)()>(void (*)(void)*) -->
           <function-decl name='__destroy&lt;void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_construct.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
             <!-- void -->
             <return type-id='type-id-75'/>
@@ -27865,15 +27865,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__copy_move<false, true, std::random_access_iterator_tag>::__copy_m<void (*)()>(void (*)(void) const*, void (*)(void)*) -->
           <function-decl name='__copy_m&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='376' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -27933,15 +27933,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void(*)(void) const*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__copy_move_backward<false, true, std::random_access_iterator_tag>::__copy_move_b<void (*)()>(void (*)(void) const*, void (*)(void)*) -->
           <function-decl name='__copy_move_b&lt;void (*)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_algobase.h' line='572' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void) const*' -->
+            <!-- parameter of type 'void (*)(void) const*' -->
             <parameter type-id='type-id-730'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -28012,15 +28012,15 @@
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
-          <!-- void(*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void(*)(void)*, void(*)(void)*) -->
+          <!-- void (*)(void)* std::__uninitialized_copy<true>::uninitialized_copy<void (**)(), void (**)()>(void (*)(void)*, void (*)(void)*) -->
           <function-decl name='uninitialized_copy&lt;void (**)(), void (**)()&gt;' filepath='/usr/lib/gcc/x86_64-redhat-linux/4.4.7/../../../../include/c++/4.4.7/bits/stl_uninitialized.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- parameter of type 'void(*)(void)*' -->
+            <!-- parameter of type 'void (*)(void)*' -->
             <parameter type-id='type-id-732'/>
-            <!-- void(*)(void)* -->
+            <!-- void (*)(void)* -->
             <return type-id='type-id-732'/>
           </function-decl>
         </member-function>
@@ -29414,20 +29414,20 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
+            <!-- void (*)(void*) base::internal::HookList<void (*)(const void*)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- void(*)(void*) -->
+              <!-- void (*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void(*)(void*)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*)>::Traverse(void (*)(void*)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1497' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)*' -->
+              <!-- parameter of type 'void (*)(void*)*' -->
               <parameter type-id='type-id-1580'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29445,33 +29445,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void(*)(void*)) -->
+            <!-- void (*)(void*) base::internal::HookList<void (*)(const void*)>::ExchangeSingular(void (*)(void*)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
-              <!-- void(*)(void*) -->
+              <!-- void (*)(void*) -->
               <return type-id='type-id-193'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void(*)(void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Remove(void (*)(void*)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void(*)(void*)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*)>::Add(void (*)(void*)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*)>*' -->
               <parameter type-id='type-id-1477' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*)' -->
+              <!-- parameter of type 'void (*)(void*)' -->
               <parameter type-id='type-id-193'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -29498,11 +29498,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
+            <!-- void (*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::GetSingular() -->
             <function-decl name='GetSingular' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv' filepath='src/malloc_hook-inl.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE11GetSingularEv'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- void(*)(void*, size_t) -->
+              <!-- void (*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
@@ -29516,11 +29516,11 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void(*)(void*, size_t)*, int) -->
+            <!-- int base::internal::HookList<void (*)(const void*, size_t)>::Traverse(void (*)(void*, size_t)*, int) -->
             <function-decl name='Traverse' mangled-name='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i' filepath='src/malloc_hook-inl.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK4base8internal8HookListIPFvPKvmEE8TraverseEPS5_i'>
               <!-- implicit parameter of type 'const base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1499' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)*' -->
+              <!-- parameter of type 'void (*)(void*, size_t)*' -->
               <parameter type-id='type-id-1582'/>
               <!-- parameter of type 'int' -->
               <parameter type-id='type-id-1'/>
@@ -29529,33 +29529,33 @@
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- void(*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void(*)(void*, size_t)) -->
+            <!-- void (*)(void*, size_t) base::internal::HookList<void (*)(const void*, size_t)>::ExchangeSingular(void (*)(void*, size_t)) -->
             <function-decl name='ExchangeSingular' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_' filepath='src/malloc_hook-inl.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE16ExchangeSingularES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
-              <!-- void(*)(void*, size_t) -->
+              <!-- void (*)(void*, size_t) -->
               <return type-id='type-id-386'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void(*)(void*, size_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Remove(void (*)(void*, size_t)) -->
             <function-decl name='Remove' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_' filepath='src/malloc_hook-inl.h' line='72' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE6RemoveES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
-            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void(*)(void*, size_t)) -->
+            <!-- bool base::internal::HookList<void (*)(const void*, size_t)>::Add(void (*)(void*, size_t)) -->
             <function-decl name='Add' mangled-name='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_' filepath='src/malloc_hook-inl.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN4base8internal8HookListIPFvPKvmEE3AddES5_'>
               <!-- implicit parameter of type 'base::internal::HookList<void (*)(const void*, size_t)>*' -->
               <parameter type-id='type-id-1478' is-artificial='yes'/>
-              <!-- parameter of type 'void(*)(void*, size_t)' -->
+              <!-- parameter of type 'void (*)(void*, size_t)' -->
               <parameter type-id='type-id-386'/>
               <!-- bool -->
               <return type-id='type-id-76'/>
@@ -33076,13 +33076,13 @@
         <return type-id='type-id-73'/>
       </function-decl>
     </namespace-decl>
-    <!-- void*(*__malloc_hook)(size_t, void*) -->
+    <!-- void* (* __malloc_hook)(size_t, void*) -->
     <var-decl name='__malloc_hook' type-id='type-id-1588' mangled-name='__malloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='135' column='1' elf-symbol-id='__malloc_hook'/>
-    <!-- void*(*__realloc_hook)(void*, size_t, void*) -->
+    <!-- void* (* __realloc_hook)(void*, size_t, void*) -->
     <var-decl name='__realloc_hook' type-id='type-id-1590' mangled-name='__realloc_hook' visibility='default' filepath='src/libc_override_glibc.h' line='137' column='1' elf-symbol-id='__realloc_hook'/>
-    <!-- void(*__free_hook)(void*, void*) -->
+    <!-- void (* __free_hook)(void*, void*) -->
     <var-decl name='__free_hook' type-id='type-id-1584' mangled-name='__free_hook' visibility='default' filepath='src/libc_override_glibc.h' line='139' column='1' elf-symbol-id='__free_hook'/>
-    <!-- void*(*__memalign_hook)(size_t, size_t, void*) -->
+    <!-- void* (* __memalign_hook)(size_t, size_t, void*) -->
     <var-decl name='__memalign_hook' type-id='type-id-1586' mangled-name='__memalign_hook' visibility='default' filepath='src/libc_override_glibc.h' line='141' column='1' elf-symbol-id='__memalign_hook'/>
     <!-- namespace FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead -->
     <namespace-decl name='FLAG__namespace_do_not_use_directly_use_DECLARE_int64_instead'>
diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi
index 218d0df7..4a6155de 100644
--- a/tests/data/test-annotate/test2.so.abi
+++ b/tests/data/test-annotate/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
index a6759aa3..b8a708cd 100644
--- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkParallelCore-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOCore-6.1.so.1'/>
diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 3f28dbde..94229e2e 100644
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi
index ffd5b4f4..330ccd99 100644
--- a/tests/data/test-annotate/test3.so.abi
+++ b/tests/data/test-annotate/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi
index b478fe5c..6f037047 100644
--- a/tests/data/test-annotate/test4.so.abi
+++ b/tests/data/test-annotate/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi
index 7d6dab6d..54f086c0 100644
--- a/tests/data/test-annotate/test5.o.abi
+++ b/tests/data/test-annotate/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- bar(void*) -->
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi
index a313c769..d6ea7b0f 100644
--- a/tests/data/test-annotate/test6.so.abi
+++ b/tests/data/test-annotate/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi
index f9120693..804716cd 100644
--- a/tests/data/test-annotate/test7.so.abi
+++ b/tests/data/test-annotate/test7.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <!-- foo(S&) -->
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
index b17505f8..ce7abff0 100644
--- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-btf/test0.o.abi b/tests/data/test-read-btf/test0.o.abi
index 123b14f5..f5ede627 100644
--- a/tests/data/test-read-btf/test0.o.abi
+++ b/tests/data/test-read-btf/test0.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-btf/test0.o'>
+<abi-corpus version='2.3' path='data/test-read-btf/test0.o'>
   <elf-function-symbols>
     <elf-symbol name='fn0' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-btf/test1.o.abi b/tests/data/test-read-btf/test1.o.abi
index 8043693a..ea01f284 100644
--- a/tests/data/test-read-btf/test1.o.abi
+++ b/tests/data/test-read-btf/test1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-btf/test1.o'>
+<abi-corpus version='2.3' path='data/test-read-btf/test1.o'>
   <elf-function-symbols>
     <elf-symbol name='fn0' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/PR27700/test-PR27700.abi b/tests/data/test-read-ctf/PR27700/test-PR27700.abi
index 7ce82097..4d488b6a 100644
--- a/tests/data/test-read-ctf/PR27700/test-PR27700.abi
+++ b/tests/data/test-read-ctf/PR27700/test-PR27700.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/PR27700/test-PR27700.o'>
+<abi-corpus version='2.3' path='data/test-read-common/PR27700/test-PR27700.o'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-PR26568-1.o.abi b/tests/data/test-read-ctf/test-PR26568-1.o.abi
index 378ef14a..7d829a36 100644
--- a/tests/data/test-read-ctf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test-PR26568-1.o'>
+<abi-corpus version='2.3' path='data/test-read-common/test-PR26568-1.o'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-PR26568-2.o.abi b/tests/data/test-read-ctf/test-PR26568-2.o.abi
index 5163c2ee..513c7289 100644
--- a/tests/data/test-read-ctf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-ctf/test-PR26568-2.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test-PR26568-2.o'>
+<abi-corpus version='2.3' path='data/test-read-common/test-PR26568-2.o'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-alias.o.abi b/tests/data/test-read-ctf/test-alias.o.abi
index cec8a2c6..13072d0f 100644
--- a/tests/data/test-read-ctf/test-alias.o.abi
+++ b/tests/data/test-read-ctf/test-alias.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-alias.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-alias.o'>
   <elf-function-symbols>
     <elf-symbol name='alias_func' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='main_func' type='func-type' binding='global-binding' visibility='default-visibility' alias='alias_func' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
index 463455c7..fee89f2f 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-A.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-ambiguous-struct-A.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-ambiguous-struct-A.o'>
   <elf-variable-symbols>
     <elf-symbol name='foo' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
index ba34d7a3..6c6f6b70 100644
--- a/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
+++ b/tests/data/test-read-ctf/test-ambiguous-struct-B.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-ambiguous-struct-B.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-ambiguous-struct-B.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='24' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-anonymous-fields.o.abi b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
index 34234d1f..8cb8257c 100644
--- a/tests/data/test-read-ctf/test-anonymous-fields.o.abi
+++ b/tests/data/test-read-ctf/test-anonymous-fields.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-anonymous-fields.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-anonymous-fields.o'>
   <elf-variable-symbols>
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-mdimension.abi b/tests/data/test-read-ctf/test-array-mdimension.abi
index 88a36fca..3e9f2179 100644
--- a/tests/data/test-read-ctf/test-array-mdimension.abi
+++ b/tests/data/test-read-ctf/test-array-mdimension.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-mdimension.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-mdimension.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='120' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-of-pointers.abi b/tests/data/test-read-ctf/test-array-of-pointers.abi
index ac67f98a..dee9c103 100644
--- a/tests/data/test-read-ctf/test-array-of-pointers.abi
+++ b/tests/data/test-read-ctf/test-array-of-pointers.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-of-pointers.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-of-pointers.o'>
   <elf-variable-symbols>
     <elf-symbol name='t' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-array-size.abi b/tests/data/test-read-ctf/test-array-size.abi
index f47c8955..e504a1dc 100644
--- a/tests/data/test-read-ctf/test-array-size.abi
+++ b/tests/data/test-read-ctf/test-array-size.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-array-size.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-array-size.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='baz' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-bitfield-enum.abi b/tests/data/test-read-ctf/test-bitfield-enum.abi
index d1505469..fedaf255 100644
--- a/tests/data/test-read-ctf/test-bitfield-enum.abi
+++ b/tests/data/test-read-ctf/test-bitfield-enum.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-bitfield-enum.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-bitfield-enum.o'>
   <elf-variable-symbols>
     <elf-symbol name='e' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-bitfield.abi b/tests/data/test-read-ctf/test-bitfield.abi
index 7a28278e..0484539a 100644
--- a/tests/data/test-read-ctf/test-bitfield.abi
+++ b/tests/data/test-read-ctf/test-bitfield.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-bitfield.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-bitfield.o'>
   <elf-variable-symbols>
     <elf-symbol name='f' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='fb' size='1' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-callback.abi b/tests/data/test-read-ctf/test-callback.abi
index 96ea10f0..3d51043c 100644
--- a/tests/data/test-read-ctf/test-callback.abi
+++ b/tests/data/test-read-ctf/test-callback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-callback.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-callback.o'>
   <elf-function-symbols>
     <elf-symbol name='assign' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='f2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-callback2.abi b/tests/data/test-read-ctf/test-callback2.abi
index 8f140e85..37b14c19 100644
--- a/tests/data/test-read-ctf/test-callback2.abi
+++ b/tests/data/test-read-ctf/test-callback2.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-callback2.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-callback2.o'>
   <elf-variable-symbols>
     <elf-symbol name='s0' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
index 0e9e5741..a203300a 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-a.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-conflicting-type-syms-a.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-conflicting-type-syms-a.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='ignore2' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
index 1722e93a..11142929 100644
--- a/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
+++ b/tests/data/test-read-ctf/test-conflicting-type-syms-b.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-conflicting-type-syms-b.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-conflicting-type-syms-b.o'>
   <elf-variable-symbols>
     <elf-symbol name='b' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='ignore1' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-const-array.abi b/tests/data/test-read-ctf/test-const-array.abi
index 4b2bc3d2..8c019f7d 100644
--- a/tests/data/test-read-ctf/test-const-array.abi
+++ b/tests/data/test-read-ctf/test-const-array.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-const-array.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-const-array.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='32' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-dynamic-array.o.abi b/tests/data/test-read-ctf/test-dynamic-array.o.abi
index 6cd00ad8..f187c583 100644
--- a/tests/data/test-read-ctf/test-dynamic-array.o.abi
+++ b/tests/data/test-read-ctf/test-dynamic-array.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-dynamic-array.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-dynamic-array.o'>
   <elf-function-symbols>
     <elf-symbol name='use_struct_s' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test-enum-many.o.hash.abi b/tests/data/test-read-ctf/test-enum-many.o.hash.abi
index 761d3469..f1ae0363 100644
--- a/tests/data/test-read-ctf/test-enum-many.o.hash.abi
+++ b/tests/data/test-read-ctf/test-enum-many.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum-many.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum-many.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='foo' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi b/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
index 236f2399..a4f97b11 100644
--- a/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
+++ b/tests/data/test-read-ctf/test-enum-symbol.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum-symbol.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum-symbol.o'>
   <elf-variable-symbols>
     <elf-symbol name='primary1' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-enum.o.abi b/tests/data/test-read-ctf/test-enum.o.abi
index ca02fdf4..f92bd16a 100644
--- a/tests/data/test-read-ctf/test-enum.o.abi
+++ b/tests/data/test-read-ctf/test-enum.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-enum.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-enum.o'>
   <elf-variable-symbols>
     <elf-symbol name='bar' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='foo' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-fallback.abi b/tests/data/test-read-ctf/test-fallback.abi
index 1ed9508c..ca7d86b7 100644
--- a/tests/data/test-read-ctf/test-fallback.abi
+++ b/tests/data/test-read-ctf/test-fallback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-fallback.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-fallback.o'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-forward-type-decl.abi b/tests/data/test-read-ctf/test-forward-type-decl.abi
index 46caf6a0..20c8efe9 100644
--- a/tests/data/test-read-ctf/test-forward-type-decl.abi
+++ b/tests/data/test-read-ctf/test-forward-type-decl.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-forward-type-decl.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-forward-type-decl.o'>
   <elf-variable-symbols>
     <elf-symbol name='addr' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-ctf/test-functions-declaration.abi b/tests/data/test-read-ctf/test-functions-declaration.abi
index 84f50c39..04cdae4c 100644
--- a/tests/data/test-read-ctf/test-functions-declaration.abi
+++ b/tests/data/test-read-ctf/test-functions-declaration.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-functions-declaration.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-functions-declaration.o'>
   <elf-function-symbols>
     <elf-symbol name='attribute_container_add_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='attribute_container_device_trigger' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test-linux-module.abi b/tests/data/test-read-ctf/test-linux-module.abi
index 7f4806cc..89066149 100644
--- a/tests/data/test-read-ctf/test-linux-module.abi
+++ b/tests/data/test-read-ctf/test-linux-module.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-linux-module.ko'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-linux-module.ko'>
   <elf-function-symbols>
     <elf-symbol name='testexport' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x533ba8e8'/>
     <elf-symbol name='testexport2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x65900b2f'/>
diff --git a/tests/data/test-read-ctf/test-list-struct.abi b/tests/data/test-read-ctf/test-list-struct.abi
index bcbbfc81..1f506d48 100644
--- a/tests/data/test-read-ctf/test-list-struct.abi
+++ b/tests/data/test-read-ctf/test-list-struct.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test-list-struct.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test-list-struct.o'>
   <elf-variable-symbols>
     <elf-symbol name='n1' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='n2' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test0.abi b/tests/data/test-read-ctf/test0.abi
index 0cc90924..0c8dc0ae 100644
--- a/tests/data/test-read-ctf/test0.abi
+++ b/tests/data/test-read-ctf/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test0'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test0'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test0.hash.abi b/tests/data/test-read-ctf/test0.hash.abi
index e554f91d..a1fb5fab 100644
--- a/tests/data/test-read-ctf/test0.hash.abi
+++ b/tests/data/test-read-ctf/test0.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test0'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test0'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test1.so.abi b/tests/data/test-read-ctf/test1.so.abi
index 94530753..3c208642 100644
--- a/tests/data/test-read-ctf/test1.so.abi
+++ b/tests/data/test-read-ctf/test1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test1.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test1.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test1.so.hash.abi b/tests/data/test-read-ctf/test1.so.hash.abi
index f70ed683..e2266db4 100644
--- a/tests/data/test-read-ctf/test1.so.hash.abi
+++ b/tests/data/test-read-ctf/test1.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test1.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test1.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test2.so.abi b/tests/data/test-read-ctf/test2.so.abi
index db4a958e..98d74608 100644
--- a/tests/data/test-read-ctf/test2.so.abi
+++ b/tests/data/test-read-ctf/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test2.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test2.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test2.so.hash.abi b/tests/data/test-read-ctf/test2.so.hash.abi
index 5997abb1..477a9324 100644
--- a/tests/data/test-read-ctf/test2.so.hash.abi
+++ b/tests/data/test-read-ctf/test2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test2.so'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test2.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test3.so.abi b/tests/data/test-read-ctf/test3.so.abi
index 253f9c08..a59e91f9 100644
--- a/tests/data/test-read-ctf/test3.so.abi
+++ b/tests/data/test-read-ctf/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.3' path='data/test-read-common/test3.so' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test3.so.hash.abi b/tests/data/test-read-ctf/test3.so.hash.abi
index dff5fdc8..78019858 100644
--- a/tests/data/test-read-ctf/test3.so.hash.abi
+++ b/tests/data/test-read-ctf/test3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test3.so' soname='test3.so.1'>
+<abi-corpus version='2.3' path='data/test-read-common/test3.so' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test4.so.abi b/tests/data/test-read-ctf/test4.so.abi
index 90549d45..7dd602b4 100644
--- a/tests/data/test-read-ctf/test4.so.abi
+++ b/tests/data/test-read-ctf/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test4.so'>
+<abi-corpus version='2.3' path='data/test-read-common/test4.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test4.so.hash.abi b/tests/data/test-read-ctf/test4.so.hash.abi
index 13712aa2..1f09041e 100644
--- a/tests/data/test-read-ctf/test4.so.hash.abi
+++ b/tests/data/test-read-ctf/test4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-common/test4.so'>
+<abi-corpus version='2.3' path='data/test-read-common/test4.so'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-ctf/test5.o.abi b/tests/data/test-read-ctf/test5.o.abi
index be354278..816e301a 100644
--- a/tests/data/test-read-ctf/test5.o.abi
+++ b/tests/data/test-read-ctf/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test5.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test5.o'>
   <elf-function-symbols>
     <elf-symbol name='bar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='bar2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-ctf/test7.o.abi b/tests/data/test-read-ctf/test7.o.abi
index 16c44565..6491db59 100644
--- a/tests/data/test-read-ctf/test7.o.abi
+++ b/tests/data/test-read-ctf/test7.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test7.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test7.o'>
   <elf-function-symbols>
     <elf-symbol name='first_type_constructor' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test8.o.abi b/tests/data/test-read-ctf/test8.o.abi
index c5913fb6..d1e7321c 100644
--- a/tests/data/test-read-ctf/test8.o.abi
+++ b/tests/data/test-read-ctf/test8.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test8.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test8.o'>
   <elf-function-symbols>
     <elf-symbol name='bar' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-ctf/test9.o.abi b/tests/data/test-read-ctf/test9.o.abi
index a1def56f..eb58fa3a 100644
--- a/tests/data/test-read-ctf/test9.o.abi
+++ b/tests/data/test-read-ctf/test9.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='data/test-read-ctf/test9.o'>
+<abi-corpus version='2.3' path='data/test-read-ctf/test9.o'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
index c90a38fd..23799fc9 100644
--- a/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
+++ b/tests/data/test-read-dwarf/PR22015-libboost_iostreams.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/cached/third_party/boost-1.60.0/libboost_system.so'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 678c67f0..2ba39ed1 100644
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/cached/third_party/s2/libs2.so'/>
     <dependency name='build/cached/third_party/s2/util/math/libmath.so'/>
diff --git a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
index 8a962550..ca49b9b8 100644
--- a/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
+++ b/tests/data/test-read-dwarf/PR24378-fn-is-not-scope.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_ZN4stac14buggy_functionEPFvPFfiiEE' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
index e9ce423b..971e60aa 100644
--- a/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
+++ b/tests/data/test-read-dwarf/PR25007-sdhci.ko.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='__sdhci_add_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x74ae518'/>
     <elf-symbol name='__sdhci_read_caps' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x711f65c'/>
diff --git a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
index 97b171e8..d8369a63 100644
--- a/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
+++ b/tests/data/test-read-dwarf/PR25042-libgdbm-clang-dwarf5.so.6.0.0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libgdbm.so.6'>
+<abi-corpus version='2.3' soname='libgdbm.so.6'>
   <elf-needed>
     <dependency name='libc.so.6'/>
     <dependency name='ld-linux-x86-64.so.2'/>
diff --git a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
index 8460c0ce..f2d363d2 100644
--- a/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
+++ b/tests/data/test-read-dwarf/PR26261/PR26261-exe.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/PR27700/test-PR27700.abi b/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
index c4223bd6..11134e4d 100644
--- a/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
+++ b/tests/data/test-read-dwarf/PR27700/test-PR27700.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='foo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi b/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
index 4d10a3ef..1b138c9d 100644
--- a/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
+++ b/tests/data/test-read-dwarf/PR28584/PR28584-smv.clang.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='_ZN1N1S1DE' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi b/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
index 963c21e6..ba0c1992 100644
--- a/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
+++ b/tests/data/test-read-dwarf/PR29443-missing-xx.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='xx' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi b/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
index 122a075a..2af2cbd3 100644
--- a/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
+++ b/tests/data/test-read-dwarf/PR29692-kdelibs3-libkjava.so.1.0.0.abi
@@ -1,2 +1,2 @@
-<abi-corpus version='2.2' soname='libkjava.so.1'>
+<abi-corpus version='2.3' soname='libkjava.so.1'>
 </abi-corpus>
diff --git a/tests/data/test-read-dwarf/libtest23.so.abi b/tests/data/test-read-dwarf/libtest23.so.abi
index 53fa11ad..e221b36b 100644
--- a/tests/data/test-read-dwarf/libtest23.so.abi
+++ b/tests/data/test-read-dwarf/libtest23.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
index 041cfa9e..3f76ba1a 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns-2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
index 041cfa9e..3f76ba1a 100644
--- a/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
+++ b/tests/data/test-read-dwarf/libtest24-drop-fns.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-dwarf/test-PR26568-1.o.abi b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
index 114adc6f..86ffc190 100644
--- a/tests/data/test-read-dwarf/test-PR26568-1.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-PR26568-2.o.abi b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
index b9186d4a..3d6d6ea7 100644
--- a/tests/data/test-read-dwarf/test-PR26568-2.o.abi
+++ b/tests/data/test-read-dwarf/test-PR26568-2.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='fun' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-fallback.abi b/tests/data/test-read-dwarf/test-fallback.abi
index 14879bee..92cf7c59 100644
--- a/tests/data/test-read-dwarf/test-fallback.abi
+++ b/tests/data/test-read-dwarf/test-fallback.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-variable-symbols>
     <elf-symbol name='a' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
diff --git a/tests/data/test-read-dwarf/test-libaaudio.so.abi b/tests/data/test-read-dwarf/test-libaaudio.so.abi
index 5033c7c1..51da7928 100644
--- a/tests/data/test-read-dwarf/test-libaaudio.so.abi
+++ b/tests/data/test-read-dwarf/test-libaaudio.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libaaudio.so'>
+<abi-corpus version='2.3' soname='libaaudio.so'>
   <elf-needed>
     <dependency name='libaaudio_internal.so'/>
     <dependency name='libaudioclient.so'/>
diff --git a/tests/data/test-read-dwarf/test-libandroid.so.abi b/tests/data/test-read-dwarf/test-libandroid.so.abi
index 3b7d5ad6..39be9340 100644
--- a/tests/data/test-read-dwarf/test-libandroid.so.abi
+++ b/tests/data/test-read-dwarf/test-libandroid.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libandroid.so'>
+<abi-corpus version='2.3' soname='libandroid.so'>
   <elf-needed>
     <dependency name='liblog.so'/>
     <dependency name='libhidlbase.so'/>
diff --git a/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
index 39980bcd..dd2582b3 100644
--- a/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
+++ b/tests/data/test-read-dwarf/test-pointer-to-member-1.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='main' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test-suppressed-alias.o.abi b/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
index 5bdc88d6..8c465da0 100644
--- a/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
+++ b/tests/data/test-read-dwarf/test-suppressed-alias.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='alias_func' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='main_func' type='func-type' binding='global-binding' visibility='default-visibility' alias='alias_func' is-defined='yes'/>
diff --git a/tests/data/test-read-dwarf/test0.abi b/tests/data/test-read-dwarf/test0.abi
index 618004c1..e98a0a0d 100644
--- a/tests/data/test-read-dwarf/test0.abi
+++ b/tests/data/test-read-dwarf/test0.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test0.hash.abi b/tests/data/test-read-dwarf/test0.hash.abi
index 715f3cdf..88e26c21 100644
--- a/tests/data/test-read-dwarf/test0.hash.abi
+++ b/tests/data/test-read-dwarf/test0.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test1.abi b/tests/data/test-read-dwarf/test1.abi
index 2216ee7c..3e70c9df 100644
--- a/tests/data/test-read-dwarf/test1.abi
+++ b/tests/data/test-read-dwarf/test1.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test1.hash.abi b/tests/data/test-read-dwarf/test1.hash.abi
index 966ced1d..5b081f54 100644
--- a/tests/data/test-read-dwarf/test1.hash.abi
+++ b/tests/data/test-read-dwarf/test1.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
index 07c1c623..40a55874 100644
--- a/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
+++ b/tests/data/test-read-dwarf/test10-pr18818-gcc.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
     <dependency name='librt.so.1'/>
diff --git a/tests/data/test-read-dwarf/test11-pr18828.so.abi b/tests/data/test-read-dwarf/test11-pr18828.so.abi
index 5702c50d..b9669a7c 100644
--- a/tests/data/test-read-dwarf/test11-pr18828.so.abi
+++ b/tests/data/test-read-dwarf/test11-pr18828.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/mongo/db/libserver_parameters.so'/>
     <dependency name='build/debug/mongo/libbase.so'/>
diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 90914ded..7041825c 100644
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/mongo/bson/mutable/libmutable_bson.so'/>
     <dependency name='build/debug/mongo/bson/util/libbson_extract.so'/>
diff --git a/tests/data/test-read-dwarf/test13-pr18894.so.abi b/tests/data/test-read-dwarf/test13-pr18894.so.abi
index b3888eaf..257a053c 100644
--- a/tests/data/test-read-dwarf/test13-pr18894.so.abi
+++ b/tests/data/test-read-dwarf/test13-pr18894.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libdbus-1.so.3'>
+<abi-corpus version='2.3' soname='libdbus-1.so.3'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test14-pr18893.so.abi b/tests/data/test-read-dwarf/test14-pr18893.so.abi
index 4ab5abc9..62af1d15 100644
--- a/tests/data/test-read-dwarf/test14-pr18893.so.abi
+++ b/tests/data/test-read-dwarf/test14-pr18893.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libGLU.so.1'>
+<abi-corpus version='2.3' soname='libGLU.so.1'>
   <elf-needed>
     <dependency name='libGL.so.1'/>
     <dependency name='libstdc++.so.6'/>
diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 739e5931..3e63f32c 100644
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtsan.so.0'>
+<abi-corpus version='2.3' soname='libtsan.so.0'>
   <elf-needed>
     <dependency name='librt.so.1'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test16-pr18904.so.abi b/tests/data/test-read-dwarf/test16-pr18904.so.abi
index fff19e37..52ae084c 100644
--- a/tests/data/test-read-dwarf/test16-pr18904.so.abi
+++ b/tests/data/test-read-dwarf/test16-pr18904.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='liboffloadmic_host.so.5'>
+<abi-corpus version='2.3' soname='liboffloadmic_host.so.5'>
   <elf-needed>
     <dependency name='libdl.so.2'/>
     <dependency name='libstdc++.so.6'/>
diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index c5c9654a..1fc419ab 100644
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libharfbuzz.so.0'>
+<abi-corpus version='2.3' soname='libharfbuzz.so.0'>
   <elf-needed>
     <dependency name='libglib-2.0.so.0'/>
     <dependency name='libfreetype.so.6'/>
diff --git a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
index 698dcce2..69237e27 100644
--- a/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test18-pr19037-libvtkRenderingLIC-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkRenderingLIC-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkRenderingLIC-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOXML-6.1.so.1'/>
diff --git a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
index 31ea116e..68579bfa 100644
--- a/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libtcmalloc_and_profiler.so.4'>
+<abi-corpus version='2.3' soname='libtcmalloc_and_profiler.so.4'>
   <elf-needed>
     <dependency name='libunwind.so.8'/>
     <dependency name='libpthread.so.0'/>
diff --git a/tests/data/test-read-dwarf/test2.so.abi b/tests/data/test-read-dwarf/test2.so.abi
index f8adb180..84696d10 100644
--- a/tests/data/test-read-dwarf/test2.so.abi
+++ b/tests/data/test-read-dwarf/test2.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test2.so.hash.abi b/tests/data/test-read-dwarf/test2.so.hash.abi
index fdb78c88..a69e6dd3 100644
--- a/tests/data/test-read-dwarf/test2.so.hash.abi
+++ b/tests/data/test-read-dwarf/test2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
index b38cbdd6..e59603d2 100644
--- a/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
+++ b/tests/data/test-read-dwarf/test20-pr19025-libvtkParallelCore-6.1.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libvtkParallelCore-6.1.so.1'>
+<abi-corpus version='2.3' soname='libvtkParallelCore-6.1.so.1'>
   <elf-needed>
     <dependency name='libvtkIOLegacy-6.1.so.1'/>
     <dependency name='libvtkIOCore-6.1.so.1'/>
diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index d0efa871..36a5274a 100644
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
index 751afce2..51ff158d 100644
--- a/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
+++ b/tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='libstdc++.so.6'>
+<abi-corpus version='2.3' soname='libstdc++.so.6'>
   <elf-needed>
     <dependency name='libm.so.6'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-1.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-2.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi b/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3-alias-4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3.so.abi b/tests/data/test-read-dwarf/test3.so.abi
index e14bcbde..beae2ec6 100644
--- a/tests/data/test-read-dwarf/test3.so.abi
+++ b/tests/data/test-read-dwarf/test3.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test3.so.hash.abi b/tests/data/test-read-dwarf/test3.so.hash.abi
index 03ddb23e..5cd85288 100644
--- a/tests/data/test-read-dwarf/test3.so.hash.abi
+++ b/tests/data/test-read-dwarf/test3.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' soname='test3.so.1'>
+<abi-corpus version='2.3' soname='test3.so.1'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test4.so.abi b/tests/data/test-read-dwarf/test4.so.abi
index 94f62310..0aa540aa 100644
--- a/tests/data/test-read-dwarf/test4.so.abi
+++ b/tests/data/test-read-dwarf/test4.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test4.so.hash.abi b/tests/data/test-read-dwarf/test4.so.hash.abi
index d6328c8c..38e4b195 100644
--- a/tests/data/test-read-dwarf/test4.so.hash.abi
+++ b/tests/data/test-read-dwarf/test4.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libc.so.6'/>
   </elf-needed>
diff --git a/tests/data/test-read-dwarf/test5.o.abi b/tests/data/test-read-dwarf/test5.o.abi
index d34b5f17..2ff2513f 100644
--- a/tests/data/test-read-dwarf/test5.o.abi
+++ b/tests/data/test-read-dwarf/test5.o.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test5.o.hash.abi b/tests/data/test-read-dwarf/test5.o.hash.abi
index a915111a..bfdf6c85 100644
--- a/tests/data/test-read-dwarf/test5.o.hash.abi
+++ b/tests/data/test-read-dwarf/test5.o.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3barPv' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test6.so.abi b/tests/data/test-read-dwarf/test6.so.abi
index 9007c596..33c70691 100644
--- a/tests/data/test-read-dwarf/test6.so.abi
+++ b/tests/data/test-read-dwarf/test6.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test6.so.hash.abi b/tests/data/test-read-dwarf/test6.so.hash.abi
index 67688333..3d33e88e 100644
--- a/tests/data/test-read-dwarf/test6.so.hash.abi
+++ b/tests/data/test-read-dwarf/test6.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test7.so.abi b/tests/data/test-read-dwarf/test7.so.abi
index 706a74bb..d03484ba 100644
--- a/tests/data/test-read-dwarf/test7.so.abi
+++ b/tests/data/test-read-dwarf/test7.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test7.so.hash.abi b/tests/data/test-read-dwarf/test7.so.hash.abi
index d451ff0f..d6646baa 100644
--- a/tests/data/test-read-dwarf/test7.so.hash.abi
+++ b/tests/data/test-read-dwarf/test7.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-function-symbols>
     <elf-symbol name='_Z3fooR1S' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
index 2d1a6417..a09854be 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
index a6e3f429..e5e8863e 100644
--- a/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
+++ b/tests/data/test-read-dwarf/test8-qualified-this-pointer.so.hash.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='libstdc++.so.6'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
index 632f5650..b06ade20 100644
--- a/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
+++ b/tests/data/test-read-dwarf/test9-pr18818-clang.so.abi
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2'>
+<abi-corpus version='2.3'>
   <elf-needed>
     <dependency name='build/debug/third_party/boost-1.56.0/libboost_system.so'/>
     <dependency name='libm.so.6'/>
diff --git a/tests/data/test-read-write/test-crc.xml b/tests/data/test-read-write/test-crc.xml
index 5b3ac93e..6e50fc4d 100644
--- a/tests/data/test-read-write/test-crc.xml
+++ b/tests/data/test-read-write/test-crc.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
+<abi-corpus version='2.3' path='tests/data/test-symtab/kernel-modversions/one_of_each.ko' architecture='elf-amd-x86_64'>
   <elf-function-symbols>
     <elf-symbol name='exported_function' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe52d5bcf'/>
     <elf-symbol name='exported_function_gpl' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfda43846'/>
diff --git a/tests/data/test-read-write/test26.xml b/tests/data/test-read-write/test26.xml
index 973733e6..975c1c68 100644
--- a/tests/data/test-read-write/test26.xml
+++ b/tests/data/test-read-write/test26.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='libtest-v0.so'>
+<abi-corpus version='2.3' path='libtest-v0.so'>
   <elf-function-symbols>
     <elf-symbol name='_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
diff --git a/tests/data/test-read-write/test27.xml b/tests/data/test-read-write/test27.xml
index 6494f078..cd2a004b 100644
--- a/tests/data/test-read-write/test27.xml
+++ b/tests/data/test-read-write/test27.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='repr7' architecture='elf-amd-x86_64'>
+<abi-corpus version='2.3' path='repr7' architecture='elf-amd-x86_64'>
   <elf-function-symbols>
     <elf-symbol name='_Z2fni' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
diff --git a/tests/data/test-read-write/test28-without-std-fns-ref.xml b/tests/data/test-read-write/test28-without-std-fns-ref.xml
index 4402f610..3230c839 100644
--- a/tests/data/test-read-write/test28-without-std-fns-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-fns-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.3' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
diff --git a/tests/data/test-read-write/test28-without-std-vars-ref.xml b/tests/data/test-read-write/test28-without-std-vars-ref.xml
index a32026b5..42cda200 100644
--- a/tests/data/test-read-write/test28-without-std-vars-ref.xml
+++ b/tests/data/test-read-write/test28-without-std-vars-ref.xml
@@ -1,4 +1,4 @@
-<abi-corpus version='2.2' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
+<abi-corpus version='2.3' path='tests/data/test-read-dwarf/libtest24-drop-fns.so'>
   <elf-needed>
     <dependency name='libgcc_s.so.1'/>
     <dependency name='libc.so.6'/>
-- 
2.39.3



-- 
		Dodji


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 4/4, applied] Bump LIBABIGAIL_SO_CURRENT version to 4
  2023-12-01 15:51 [PATCH 0/4] Support C++ pointer-to-member types Dodji Seketeli
                   ` (2 preceding siblings ...)
  2023-12-01 15:55 ` [PATCH 3/4, applied] Bump abixml version to 2.3 Dodji Seketeli
@ 2023-12-01 15:57 ` Dodji Seketeli
  3 siblings, 0 replies; 5+ messages in thread
From: Dodji Seketeli @ 2023-12-01 15:57 UTC (permalink / raw)
  To: Dodji Seketeli; +Cc: libabigail

Hello,

Recent patches change the ABI of the library, namely, by adding
parameters to functions like is_pointer_type or adding virtual member
functions to classes in the IR.  Thus the LIBABIGAIL_SO_CURRENT
version has to be bumped from 3 to 4.

	* configure.ac: Set LIBABIGAIL_SO_CURRENT to 4.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Applied to master.
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2da4d152..65b738d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl    then increment LIBABIGAIL_SO_AGE.
 dnl 
 dnl 4. If any interfaces have been removed or changed since the last
 dnl     public release, then set LIBABIGAIL_SO_AGE to 0.
-m4_define([libabigail_so_current],  [3])
+m4_define([libabigail_so_current],  [4])
 m4_define([libabigail_so_revision], [0])
 m4_define([libabigail_so_age],      [0])
 
-- 
2.39.3

-- 
		Dodji


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-12-01 15:57 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-01 15:51 [PATCH 0/4] Support C++ pointer-to-member types Dodji Seketeli
2023-12-01 15:54 ` [PATCH 1/4, applied] Improve type naming Dodji Seketeli
2023-12-01 15:54 ` [PATCH 2/4, applied] Bug 30260 - Support pointer-to-member type Dodji Seketeli
2023-12-01 15:55 ` [PATCH 3/4, applied] Bump abixml version to 2.3 Dodji Seketeli
2023-12-01 15:57 ` [PATCH 4/4, applied] Bump LIBABIGAIL_SO_CURRENT version to 4 Dodji Seketeli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).